diff --git a/.github/workflows/partial-publish.yaml b/.github/workflows/partial-publish.yaml
index 380ec4e..aee71c3 100644
--- a/.github/workflows/partial-publish.yaml
+++ b/.github/workflows/partial-publish.yaml
@@ -48,7 +48,7 @@ jobs:
         if: ${{ inputs.release == false }}
         run: |
           docker build --push \
-            --tag ghcr.io/hay-kot/homebox:{{ inputs.tag }} \
+            --tag "ghcr.io/hay-kot/homebox:{{ inputs.tag }}" \
             --build-arg COMMIT=$(git rev-parse HEAD) \
             --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --platform linux/amd64,linux/arm64,linux/arm/v7 .
@@ -57,9 +57,9 @@ jobs:
         if: ${{ inputs.release == true }}
         run: |
           docker build --push \
-            --tag ghcr.io/hay-kot/homebox:nightly \
-            --tag ghcr.io/hay-kot/homebox:latest \
-            --tag ghcr.io/hay-kot/homebox:{{ inputs.tag }} \
+            --tag "ghcr.io/hay-kot/homebox:nightly" \
+            --tag "ghcr.io/hay-kot/homebox:latest" \
+            --tag "ghcr.io/hay-kot/homebox:{{ inputs.tag }}" \
             --build-arg COMMIT=$(git rev-parse HEAD) \
             --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --platform linux/amd64,linux/arm64,linux/arm/v7 .
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 05686f4..b1c9e15 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -31,6 +31,17 @@ jobs:
       - uses: superfly/flyctl-actions/setup-flyctl@master
       - run: flyctl deploy --remote-only
 
+  publish-nightly:
+    name: "Publish Nightly"
+    needs:
+      - backend-tests
+      - frontend-tests
+    uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main
+    with:
+      tag: nightly
+    secrets:
+      GH_TOKEN: ${{ secrets.CR_PAT }}
+
   publish-tag:
     if: github.event_name == 'release'
     name: "Publish Tag"
@@ -44,17 +55,6 @@ jobs:
     secrets:
       GH_TOKEN: ${{ secrets.CR_PAT }}
 
-  publish-nightly:
-    name: "Publish Nightly"
-    needs:
-      - backend-tests
-      - frontend-tests
-    uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main
-    with:
-      tag: nightly
-    secrets:
-      GH_TOKEN: ${{ secrets.CR_PAT }}
-
   deploy-docs:
     name: Deploy docs
     needs: