diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 9fdce19c..ac2b8f81 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -46,9 +46,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ inputs.image-name }}
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=sha,prefix=${{ env.TAG_PREFIX }},format=short,enable={{!is_default_branch}}
-            type=ref,event=tag,enable={{!is_default_branch}}
+            type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
+            type=sha,prefix=${{ env.TAG_PREFIX }},format=short,enable=${{ github.ref_name != 'main' }}
+            type=ref,event=tag,enable=${{ github.ref_name != 'main' }}
       - name: Build and push Docker image
         uses: docker/build-push-action@v3.2.0
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6eafe30c..c42b54f0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,6 +13,7 @@ jobs:
     uses: ./.github/workflows/pre-commit.yaml
   build-backend:
     uses: ./.github/workflows/docker-build.yaml
+    needs: pre-commit
     with:
       image-name: oasst-backend
       context: .
@@ -20,6 +21,7 @@ jobs:
       build-args: ""
   build-web:
     uses: ./.github/workflows/docker-build.yaml
+    needs: pre-commit
     with:
       image-name: oasst-web
       context: .
@@ -27,6 +29,7 @@ jobs:
       build-args: ""
   build-bot:
     uses: ./.github/workflows/docker-build.yaml
+    needs: pre-commit
     with:
       image-name: oasst-discord-bot
       context: .