5 files changed, 4 insertions, 15 deletions
diff --git a/.github/issue_labeler.yml b/.github/issue_labeler.yml
index 3a1261eebc..dba4581808 100644
--- a/.github/issue_labeler.yml
+++ b/.github/issue_labeler.yml
@@ -6,8 +6,6 @@ needs_triage:
   - "Feature Summary"
 "component:ui":
   - "\\[X\\] UI"
-"component:ui_next":
-  - "\\[X\\] UI \\(tech preview\\)"
 "component:api":
   - "\\[X\\] API"
 "component:docs":
diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml
index c886330875..548f00ca4b 100644
--- a/.github/pr_labeler.yml
+++ b/.github/pr_labeler.yml
@@ -1,8 +1,5 @@
 "component:api":
-  - any: ["awx/**/*", "!awx/ui/**"]
-
-"component:ui":
-  - any: ["awx/ui/**/*"]
+  - any: ["awx/**/*"]
 
 "component:docs":
   - any: ["docs/**/*"]
@@ -14,5 +11,4 @@
   - any: ["awx_collection/**/*"]
 
 "dependencies":
-  - any: ["awx/ui/package.json"]
   - any: ["requirements/*"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca30e2a1a2..0e67e24afa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,12 +31,7 @@ jobs:
             command: /start_tests.sh test_collection_all
           - name: api-schema
             command: /start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{ github.event.pull_request.base.ref }}
-          - name: ui-lint
-            command: make ui-lint
-          - name: ui-test-screens
-            command: make ui-test-screens
-          - name: ui-test-general
-            command: make ui-test-general
+
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/devel_images.yml b/.github/workflows/devel_images.yml
index 0aa661d27a..f490fcb746 100644
--- a/.github/workflows/devel_images.yml
+++ b/.github/workflows/devel_images.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Prebuild new UI for awx image (to speed up build process)
         run: |
-          make ui-next
+          make ui
         if: matrix.build-targets.image-name == 'awx'
 
       - name: Build and push AWX devel images
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 00900aa450..1e6f8e5fd6 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -96,7 +96,7 @@ jobs:
 
       - name: Prebuild new UI for awx image (to speed up build process)
         working-directory: awx
-        run: make ui-next
+        run: make ui
 
       - name: Set build env variables
         run: |