diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d4669206..0ad1adb5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,13 +32,25 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build and push
+        if: github.event_name == 'push'
         uses: docker/build-push-action@v3
         with:
           context: ./docker/
           file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           builder: ${{ steps.buildx.outputs.name }}
-          push: ${{ github.event_name == 'push' }}
+          push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:latest
           cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache
           cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache,mode=max
+
+      - name: Build
+        if: github.event_name != 'push'
+        uses: docker/build-push-action@v3
+        with:
+          context: ./docker/
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          builder: ${{ steps.buildx.outputs.name }}
+          push: false
+          cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache