diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 524b1f076a4a..8805f13d6364 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -27,22 +27,16 @@ jobs:
     timeout-minutes: 40
     env:
       DOCKER_BUILDKIT: 1
-      LOCAL_DEV_CHECK: 1
       CI_RETRY_COUNT: 3
-      CAPYBARA_DOWNLOADED_FILE_DIR: /tmp/ci/downloads
-      CAPYBARA_AWS_ACCESS_KEY_ID: "${{ secrets.CAPYBARA_AWS_ACCESS_KEY_ID }}"
-      CAPYBARA_AWS_SECRET_ACCESS_KEY: "${{ secrets.CAPYBARA_AWS_SECRET_ACCESS_KEY }}"
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
     - name: Cache DOCKER
       id: cache_docker
       uses: actions/cache@v3
       with:
         path: cache/docker
+        # Note: no restore keys since whenever the files below change, we want to rebuild the full image from scratch
         key: ${{ runner.os }}-docker-ci-${{ hashFiles('docker-compose.ci.yml', 'docker/ci/*', '.ruby-version', 'bin/ci') }}
-        # Note: no restore keys since whenever the above files change, we want to rebuild the full image from scratch
     - name: Restore CI image from cache
       if: steps.cache_docker.outputs.cache-hit == 'true'
       run: docker load -i cache/docker/image.tar
@@ -82,6 +76,10 @@ jobs:
     - name: Unit tests
       run: bin/ci run-units
     - name: Feature tests
+      env:
+        CAPYBARA_DOWNLOADED_FILE_DIR: /tmp/ci/downloads
+        CAPYBARA_AWS_ACCESS_KEY_ID: "${{ secrets.CAPYBARA_AWS_ACCESS_KEY_ID }}"
+        CAPYBARA_AWS_SECRET_ACCESS_KEY: "${{ secrets.CAPYBARA_AWS_SECRET_ACCESS_KEY }}"
       run: bin/ci run-features
     - name: Save CI image to cache
       if: steps.cache_docker.outputs.cache-hit != 'true'