diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 027a348..e564069 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -3,6 +3,22 @@ on:
   workflow_dispatch:
 
 jobs:
+  get-tag:
+    runs-on: ubuntu-latest
+    outputs:
+      tag: ${{ steps.tag.outputs.tag }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Get Docker image tag
+        id: tag
+        run: |
+          if [ "${GITHUB_REF_NAME}" == "main" ]; then
+            TAG="nightly"
+          else
+            TAG="${GITHUB_REF_NAME}-nightly"
+          fi
+          echo "tag=$TAG" >> $GITHUB_ENV
   build-binaries:
     runs-on: ubuntu-latest
     steps:
@@ -45,6 +61,7 @@ jobs:
             cup-linux-arm64
 
   build-image:
+    needs: get-tag
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -69,13 +86,13 @@ jobs:
           context: .
           platforms: linux/amd64, linux/arm64
           push: true
-          tags: ghcr.io/sergi0g/cup:nightly
+          tags: ghcr.io/sergi0g/cup:${{ needs.get-tag.outputs.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
   nightly-release:
     runs-on: ubuntu-latest
-    needs: build-binaries
+    needs: [build-binaries, get-tag]
     steps:
       - name: Download binaries
         uses: actions/download-artifact@v4
@@ -86,6 +103,6 @@ jobs:
       - uses: pyTooling/Actions/releaser@r0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag: nightly
+          tag: ${{ needs.get-tag.outputs.tag }}
           rm: true
           files: binaries/*