diff --git a/.gitea/workflows/upload-image.yaml b/.gitea/workflows/upload-image.yaml
index 2c62bdf..f7da07b 100644
--- a/.gitea/workflows/upload-image.yaml
+++ b/.gitea/workflows/upload-image.yaml
@@ -53,17 +53,23 @@ jobs:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx
 
-      - name: Build and Push
+      - name: Build and Push (Latest)
         uses: docker/build-push-action@v4
+        if: steps.branch-name.outputs.current_branch == 'master'
         with:
           push: true
           context: .
-          tags: |
-            {{ if eq(steps.branch-name.outputs.current_branch, 'master') }}
-              fascinated/sharex-php-uploader:latest
-            {{ else }}
-              fascinated/sharex-php-uploader:${{ steps.branch-name.outputs.current_branch }}
-            {{ endif }}
+          tags: fascinated/sharex-php-uploader:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Build and Push (Other Branches)
+        uses: docker/build-push-action@v4
+        if: steps.branch-name.outputs.current_branch != 'master'
+        with:
+          push: true
+          context: .
+          tags: fascinated/sharex-php-uploader:${{ steps.branch-name.outputs.current_branch }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache