diff --git a/.github/actions/awx_ci_setup/action.yml b/.github/actions/awx_ci_setup/action.yml
index 552d3e61dda7..d097d76ef803 100644
--- a/.github/actions/awx_ci_setup/action.yml
+++ b/.github/actions/awx_ci_setup/action.yml
@@ -1,7 +1,3 @@
-# This currently *always* uses the "warm build cache" image
-# We should do something to allow forcing a rebuild, probably by looking for
-# some string in the commit message or something.
-
 name: Setup images for AWX
 description: Builds new awx_devel image
 inputs:
@@ -27,10 +23,13 @@ runs:
       run: |
         echo "${{ inputs.github-token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-    - name: Pre-pull latest available devel image and build HEAD on top of it
+    - name: Pre-pull latest devel image to warm cache
+      shell: bash
+      run: docker pull ghcr.io/${{ github.repository_owner }}/awx_devel:${{ github.base_ref }}
+
+    - name: Build image for current source checkout
       shell: bash
       run: |
-        docker pull ghcr.io/${{ github.repository_owner }}/awx_devel:${{ github.base_ref }}
         DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} \
         COMPOSE_TAG=${{ github.base_ref }} \
         make docker-compose-build
diff --git a/.github/actions/run_awx_devel/action.yml b/.github/actions/run_awx_devel/action.yml
index 7de3801080bd..0172b900d0b1 100644
--- a/.github/actions/run_awx_devel/action.yml
+++ b/.github/actions/run_awx_devel/action.yml
@@ -1,8 +1,4 @@
-# This currently *always* uses the "warm build cache" image
-# We should do something to allow forcing a rebuild, probably by looking for
-# some string in the commit message or something.
-
-name: Run AWX (devel environment)
+name: Run AWX docker-compose
 description: Runs AWX with `make docker-compose`
 inputs:
   build-ui:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef559ebfd7be..2b90daad2199 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,7 +59,6 @@ jobs:
         id: awx
         with:
           build-ui: false
-          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run smoke test
         run: ansible-playbook tools/docker-compose/ansible/smoke-test.yml -v
@@ -156,7 +155,6 @@ jobs:
         id: awx
         with:
           build-ui: false
-          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies for running tests
         run: |
diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
index 2a97728da7a3..34b0a76fff00 100644
--- a/.github/workflows/e2e_test.yml
+++ b/.github/workflows/e2e_test.yml
@@ -30,7 +30,6 @@ jobs:
         id: awx
         with:
           build-ui: true
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           log-filename: e2e-${{ matrix.job }}.log
 
       - name: Pull awx_cypress_base image