diff --git a/.github/workflows/global-ci.yml b/.github/workflows/global-ci.yml
index 9724ad4..cb054cc 100644
--- a/.github/workflows/global-ci.yml
+++ b/.github/workflows/global-ci.yml
@@ -29,8 +29,7 @@ on:
           A flag that determines whether the UI tests should be run or not
         type: boolean
         required: false
-        # TODO: Swap to true once these are passing consistently
-        default: false
+        default: true
       api_tests_ref:
         description: |
           The branch or PR of the go-konveyor-tests repository to clone.
@@ -82,9 +81,8 @@ on:
         description: |
           A flag that determines whether the UI tests should be run or not
         type: boolean
-        required: false
-        # TODO: Swap to true once these are passing consistently
-        default: false
+        required: true
+        default: true
       api_tests_ref:
         description: |
           The branch or PR of the go-konveyor-tests repository to clone.
@@ -117,7 +115,7 @@ jobs:
     steps:
       - name: Extract pull request number from inputs or PR description
         run: |
-          PULL_REQUEST_NUMBER=$(echo "${{ github.event.pull_request.body }}" | grep -oP '[A|a][P|p][I|i] [T|t]ests [P|p][R|r]: \K\d+' || true)
+          PULL_REQUEST_NUMBER=$(echo "${{ github.event.pull_request.body }}" | grep -oP '[A|a][P|p][I|i] [T|t]ests [P|p][R|r]:\s*\K\d+' || true)
           if [ -z "$PULL_REQUEST_NUMBER" ]; then
             echo "GOLANG_TESTS_REF=${{ inputs.api_tests_ref }}" >>$GITHUB_ENV
           else
@@ -191,9 +189,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: Support cypress-split in main tackle-ui-test project
-        # split: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-        tier: [tier1, tier2, tier3]
+        # TODO enable customizing the number of tiers run for nightlies
+        tier: [tier0] #, tier1, tier2, tier3]
     steps:
 
       - name: Extract pull request number from inputs or PR description
@@ -238,16 +235,15 @@ jobs:
       - name: install konveyor
         uses: konveyor/tackle2-operator/.github/actions/install-tackle@main
         with:
-          # TODO need to set the tackle-operator image once supported
-          # tackle-operator-image: quay.io/konveyor/tackle2-operator:${{ inputs.tag }}
-          tackle-hub-image: "quay.io/konveyor/tackle2-hub:${{ inputs.tag }}"
-          tackle-pathfinder-image: "quay.io/konveyor/tackle-pathfinder:${{ inputs.tag != 'latest' && inputs.tag || '1.3.0-native' }}"
-          tackle-ui-image: "quay.io/konveyor/tackle2-ui:${{ inputs.tag }}"
-          tackle-addon-admin-image: "quay.io/konveyor/tackle2-addon:${{ inputs.tag }}"
-          tackle-addon-windup-image: "quay.io/konveyor/tackle2-addon-windup:${{ inputs.tag }}"
-          tackle-image-pull-policy: IfNotPresent
-          tackle-windup-container-memory: 0
-          tackle-windup-container-cpu: 0
+          operator-bundle-image: "quay.io/konveyor/tackle2-operator-bundle:${{ inputs.tag }}"
+          hub-image: "quay.io/konveyor/tackle2-hub:${{ inputs.tag }}"
+          pathfinder-image: "quay.io/konveyor/tackle-pathfinder:${{ inputs.tag != 'latest' && inputs.tag || '1.3.0-native' }}"
+          ui-image: "quay.io/konveyor/tackle2-ui:${{ inputs.tag }}"
+          addon-admin-image: "quay.io/konveyor/tackle2-addon:${{ inputs.tag }}"
+          addon-analyzer-image: "quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.tag }}"
+          image-pull-policy: IfNotPresent
+          analyzer-container-memory: 0
+          analyzer-container-cpu: 0
       # end DRY
 
       - name: Wait for Ingress and expose UI service
@@ -265,15 +261,15 @@ jobs:
           echo $external_ip;
           echo "UI_URL=https://$(minikube ip)" >>$GITHUB_ENV
 
-      - name: Run login tests
-        uses: cypress-io/github-action@v5
-        env:
-          CYPRESS_user: admin
-          CYPRESS_pass: password
-          CYPRESS_tackleUrl: "${{ env.UI_URL }}"
-        with:
-          working-directory: tackle-ui-tests
-          spec: "cypress/e2e/tests/login.test.ts"
+      # - name: Run login tests
+      #   uses: cypress-io/github-action@v5
+      #   env:
+      #     CYPRESS_user: admin
+      #     CYPRESS_pass: password
+      #     CYPRESS_tackleUrl: "${{ env.UI_URL }}"
+      #   with:
+      #     working-directory: tackle-ui-tests
+      #     spec: "cypress/e2e/tests/login.test.ts"
 
       - name: Run UI tests
         uses: cypress-io/github-action@v5
@@ -285,9 +281,6 @@ jobs:
           CYPRESS_git_user: "fakeuser"
           CYPRESS_git_password: "${{ secrets.GITHUB_TOKEN }}"
           CYPRESS_git_key: "${{ secrets.GITHUB_TOKEN }}"
-          # TODO: Support cypress-split in main tackle-ui-test project
-          # CYPRESS_split: "${{ strategy.job-total }}"
-          # CYPRESS_splitIndex: "${{ strategy.job-index }}"
         with:
           working-directory: tackle-ui-tests
           spec: "**/*.test.ts"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea7b4e6..261e22b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,4 +11,4 @@ jobs:
       run_api_tests: true
       ui_tests_ref: main
       # Disabled while we wait for stability
-      run_ui_tests: false
+      run_ui_tests: true
diff --git a/.github/workflows/nightly-main.yaml b/.github/workflows/nightly-main.yaml
index d2579ca..a8dc141 100644
--- a/.github/workflows/nightly-main.yaml
+++ b/.github/workflows/nightly-main.yaml
@@ -14,4 +14,4 @@ jobs:
       run_api_tests: true
       ui_tests_ref: main
       # Disabled while we wait for stability
-      run_ui_tests: false
+      run_ui_tests: true