diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml
index ab0048d..7559fd0 100644
--- a/.github/workflows/deploy-backend.yml
+++ b/.github/workflows/deploy-backend.yml
@@ -30,10 +30,6 @@ jobs:
               - 'backend/migrations/**'
               - 'backend/rustfmt.toml'
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        if: steps.changes.outputs.backend == 'true'
-
       - name: Install Heroku CLI
         run: |
           curl https://cli-assets.heroku.com/install.sh | sh
@@ -51,11 +47,12 @@ jobs:
         env:
           HEROKU_BACKEND_APP: ${{ secrets.HEROKU_BACKEND_APP }}
         run: |
-          docker buildx build \
+          DOCKER_BUILDKIT=0 docker build \
             --platform linux/amd64 \
             -t registry.heroku.com/${HEROKU_BACKEND_APP}/web \
-            -f backend/Dockerfile backend \
-            --push
+            -f backend/Dockerfile backend
+
+          docker push registry.heroku.com/${HEROKU_BACKEND_APP}/web
         if: steps.changes.outputs.backend == 'true'
 
       - name: Release on Heroku
diff --git a/.github/workflows/deploy-frontend.yml b/.github/workflows/deploy-frontend.yml
index 5d3940c..6e7f67a 100644
--- a/.github/workflows/deploy-frontend.yml
+++ b/.github/workflows/deploy-frontend.yml
@@ -32,10 +32,6 @@ jobs:
               - 'frontend/vitest.config.ts'
               - 'frontend/tsconfig.json'
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        if: steps.changes.outputs.frontend == 'true'
-
       - name: Install Heroku CLI
         run: |
           curl https://cli-assets.heroku.com/install.sh | sh
@@ -59,7 +55,7 @@ jobs:
           PUBLIC_ACTIVITY_TOKEN_ADDRESS: ${{ secrets.PUBLIC_ACTIVITY_TOKEN_ADDRESS }}
           PUBLIC_SCHEMA_ID: ${{ secrets.PUBLIC_SCHEMA_ID }}
         run: |
-          docker buildx build \
+          DOCKER_BUILDKIT=0 docker build \
             --platform linux/amd64 \
             -t registry.heroku.com/${HEROKU_FRONTEND_APP}/web \
             -f frontend/Dockerfile frontend \
@@ -69,7 +65,8 @@ jobs:
             --build-arg PUBLIC_EAS_CONTRACT_ADDRESS="${PUBLIC_EAS_CONTRACT_ADDRESS}" \
             --build-arg PUBLIC_ACTIVITY_TOKEN_ADDRESS="${PUBLIC_ACTIVITY_TOKEN_ADDRESS}" \
             --build-arg PUBLIC_SCHEMA_ID="${PUBLIC_SCHEMA_ID}" \
-            --push
+
+          docker push registry.heroku.com/${HEROKU_FRONTEND_APP}/web
         if: steps.changes.outputs.frontend == 'true'
 
       - name: Release on Heroku