diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
index ba6f87f..a46ddae 100644
--- a/.gitea/workflows/docker-build.yml
+++ b/.gitea/workflows/docker-build.yml
@@ -66,10 +66,15 @@ jobs:
           tags: |
             # Tag based on branch
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=latest-linux,enable=${{ github.ref == 'refs/heads/main' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/development' }}
+            type=raw,value=latest-linux,enable=${{ github.ref == 'refs/heads/development' }}
             type=raw,value=development-latest,enable=${{ github.ref == 'refs/heads/development' }}
+            type=raw,value=development-latest-linux,enable=${{ github.ref == 'refs/heads/development' }}
             type=raw,value=dev-latest,enable=${{ github.ref == 'refs/heads/dev' }}
+            type=raw,value=dev-latest-linux,enable=${{ github.ref == 'refs/heads/dev' }}
             type=raw,value=staging-latest,enable=${{ github.ref == 'refs/heads/staging' }}
+            type=raw,value=staging-latest-linux,enable=${{ github.ref == 'refs/heads/staging' }}
             # Tag with commit sha
             type=sha,prefix={{branch}}-,format=short
             # Tag with date
@@ -197,7 +202,7 @@ jobs:
         run: |
           IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:latest \
-            ${IMAGE_LOWER}:latest \
+            ${IMAGE_LOWER}:latest-linux \
             ${IMAGE_LOWER}:latest-windows
 
       - name: Create and push manifest for development branch
@@ -205,10 +210,10 @@ jobs:
         run: |
           IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:latest \
-            ${IMAGE_LOWER}:latest \
+            ${IMAGE_LOWER}:latest-linux \
             ${IMAGE_LOWER}:latest-windows
           docker buildx imagetools create -t ${IMAGE_LOWER}:development-latest \
-            ${IMAGE_LOWER}:development-latest \
+            ${IMAGE_LOWER}:development-latest-linux \
             ${IMAGE_LOWER}:development-latest-windows
 
       - name: Create and push manifest for dev branch
@@ -216,7 +221,7 @@ jobs:
         run: |
           IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:dev-latest \
-            ${IMAGE_LOWER}:dev-latest \
+            ${IMAGE_LOWER}:dev-latest-linux \
             ${IMAGE_LOWER}:dev-latest-windows
 
       - name: Create and push manifest for staging branch
@@ -224,5 +229,5 @@ jobs:
         run: |
           IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:staging-latest \
-            ${IMAGE_LOWER}:staging-latest \
+            ${IMAGE_LOWER}:staging-latest-linux \
             ${IMAGE_LOWER}:staging-latest-windows