diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d47f4a6..fa6ef0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,5 +33,14 @@ jobs:
       - name: Build and Test
         run: ./gradlew --no-daemon build
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build Docker image
-        run: docker build --tag promsearch:ci .
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          tags: promsearch:ci
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b3c0c24..ed1922c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -27,6 +27,9 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_sha }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -41,6 +44,8 @@ jobs:
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/promsearch:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/promsearch:${{ github.event.workflow_run.head_sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   deploy:
     needs: build-and-push