diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 61dc8ca801b3..cb4d84a0d97b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -219,10 +219,9 @@ jobs:
       - name: Extract vendor/bundle from container
         run: |
           docker create --name bundle ${{ steps.build.outputs.imageid }}
-          rm -rf vendor/bundle || true
+          mv vendor/bundle vendor/bundle.bak
           docker cp bundle:/app/vendor/bundle vendor/bundle
           docker rm bundle
-          echo 'vendor/bundle' >> .dockerignore
       - name: Save vendor/bundle
         id: save-vendor-bundle
         uses: actions/cache/save@v4
@@ -230,6 +229,9 @@ jobs:
           path: |
             vendor/bundle
           key: ${{ steps.restore-vendor-bundle.outputs.cache-primary-key }}
+      - name: Restore pre-build endor/bundle to prevent 2nd build from scratch during push
+        run: |
+          rm -rf vendor/bundle && mv vendor/bundle.bak vendor/bundle
       - name: Test
         # We only test the native container. If that fails the builds for the others
         # will be cancelled as well.