diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f42a499..967e9f6 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -27,19 +27,10 @@ jobs:
         with:
           images: journey0ad/bitmagnet-next-web
           tags: |
-            type=raw,value=latest
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
             type=ref,event=tag
 
-      -
-        name: Determine image tag
-        id: determine_tag
-        run: |
-          if [ "${{ github.ref_name }}" == "main" ]; then
-            echo "::set-output name=tags::${{ steps.meta.outputs.tags }}"
-          else
-            echo "::set-output name=tags::journey0ad/bitmagnet-next-web:${{ github.ref_name }}"
-          fi
-      
       - 
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -47,7 +38,7 @@ jobs:
       - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      
+
       - 
         name: Build and push Docker image
         uses: docker/build-push-action@v4
@@ -55,7 +46,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.determine_tag.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max