diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8882e3..c927199 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,18 +129,22 @@ jobs:
             ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched,enable=${{ secrets.DOCKER_USERNAME != '' }}
             # Do not push to ghcr.io on PRs due to permission issues, only push if the owner is luigi311 so it doesnt fail on forks
             ghcr.io/${{ github.repository }},enable=${{ github.event_name != 'pull_request' && github.repository_owner == 'luigi311'}}
-          tags: |
-            type=raw,value=latest,enable=${{ matrix.variant == env.DEFAULT_VARIANT && github.ref_name == github.event.repository.default_branch }}
-            type=raw,value=dev,enable=${{ matrix.variant == env.DEFAULT_VARIANT && github.ref_name == 'dev' }}
-            type=raw,value=latest,suffix=-${{ matrix.variant }},enable={{ is_default_branch }}
+          tags: |            
             type=ref,event=branch,suffix=-${{ matrix.variant }}
             type=ref,event=branch,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+            
             type=ref,event=pr,suffix=-${{ matrix.variant }}
             type=ref,event=pr,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+            
             type=semver,pattern={{ version }},suffix=-${{ matrix.variant }}
             type=semver,pattern={{ version }},enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+            
             type=semver,pattern={{ major }}.{{ minor }},suffix=-${{ matrix.variant }}
             type=semver,pattern={{ major }}.{{ minor }},enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+            
+            type=semver,value=latest,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}
+            type=semver,value=latest,suffix=-${{ matrix.variant }}
+            
             type=sha,suffix=-${{ matrix.variant }}
             type=sha,enable=${{ matrix.variant == env.DEFAULT_VARIANT }}