diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
deleted file mode 100644
index 94b668d7c6..0000000000
--- a/.github/workflows/ci-actions.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-      - "release-*"
-  pull_request:
-    branches:
-      - main
-      - "release-*"
-
-jobs:
-  unit-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # Note: This should match the node version(s) used in the base Dockerfile
-        node-version: [18.x]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Verify package-lock.json
-        run: ./scripts/verify_lock.mjs
-
-      - name: Install
-        run: npm clean-install --ignore-scripts
-
-      - name: Lint sources
-        run: npm run lint
-
-      - name: Build
-        run: npm run build
-
-      - name: Test
-        run: npm run test -- --coverage --watchAll=false
-
-      - name: Upload to codecov (client)
-        uses: codecov/codecov-action@v4
-        with:
-          flags: client
-          directory: ./*/coverage
-
-      - name: Upload to codecov (server)
-        uses: codecov/codecov-action@v4
-        with:
-          flags: server
-          directory: ./*/coverage
-
-  build-and-upload-for-global-ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: save tackle2-ui image
-        run: |
-          docker build . -t quay.io/konveyor/tackle2-ui:latest
-          docker save -o /tmp/tackle2-ui.tar quay.io/konveyor/tackle2-ui:latest
-
-      - name: Upload tackle2-ui image as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: tackle2-ui
-          path: /tmp/tackle2-ui.tar
-          retention-days: 1
-
-  test-integration:
-    needs: build-and-upload-for-global-ci
-    uses: konveyor/ci/.github/workflows/global-ci.yml@main
-    with:
-      component_name: tackle2-ui
-      run_api_tests: false
diff --git a/.github/workflows/ci-global.yml b/.github/workflows/ci-global.yml
new file mode 100644
index 0000000000..4e924ca6dd
--- /dev/null
+++ b/.github/workflows/ci-global.yml
@@ -0,0 +1,50 @@
+name: CI (global konveyor CI)
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+
+###
+# The global CI settings need to be adjusted for the `release-*`` branches such that:
+#  1. The operator uses the correct `:release-*` images
+#  2. The `*-tests_ref` use the correct branches
+#
+# on:
+#   push:
+#     branches:
+#       - 'main'
+#       - 'release-*'
+#   pull_request:
+#     branches:
+#       - 'main'
+#       - 'release-*'
+##
+
+jobs:
+  build-and-upload-for-global-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: save tackle2-ui image
+        run: |
+          docker build . -t quay.io/konveyor/tackle2-ui:latest
+          docker save -o /tmp/tackle2-ui.tar quay.io/konveyor/tackle2-ui:latest
+
+      - name: Upload tackle2-ui image as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: tackle2-ui
+          path: /tmp/tackle2-ui.tar
+          retention-days: 1
+
+  run-global-ci:
+    needs: build-and-upload-for-global-ci
+    uses: konveyor/ci/.github/workflows/global-ci.yml@main
+    with:
+      component_name: tackle2-ui
+      run_api_tests: false
diff --git a/.github/workflows/ci-repo.yml b/.github/workflows/ci-repo.yml
new file mode 100644
index 0000000000..c8d89b28c6
--- /dev/null
+++ b/.github/workflows/ci-repo.yml
@@ -0,0 +1,55 @@
+name: CI (repo level)
+
+on:
+  push:
+    branches:
+      - "main"
+      - "release-*"
+  pull_request:
+    branches:
+      - "main"
+      - "release-*"
+
+# env:
+#   # Note: This should match the node version(s) used in the base Dockerfile
+#   node-version: 18.x
+
+jobs:
+  unit-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js (use the version from package.json)
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "package.json"
+          cache: "npm"
+
+      - name: Verify package-lock.json
+        run: ./scripts/verify_lock.mjs
+
+      - name: Install
+        run: npm clean-install --ignore-scripts
+
+      - name: Lint sources
+        run: npm run lint
+
+      - name: Build
+        run: npm run build
+
+      - name: Test
+        run: npm run test -- --coverage --watchAll=false
+
+      - name: Upload to codecov (client)
+        uses: codecov/codecov-action@v4
+        with:
+          flags: client
+          directory: ./*/coverage
+
+      - name: Upload to codecov (server)
+        uses: codecov/codecov-action@v4
+        with:
+          flags: server
+          directory: ./*/coverage