diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index 3a440cd..98b5029 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -63,10 +63,14 @@ jobs:
         run: |
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             echo "push=${{ github.event.inputs.push_image }}" >> $GITHUB_OUTPUT
-            echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/youtubedl-material:${{ github.event.inputs.image_tag }},ghcr.io/${{ github.repository_owner }}/youtubedl-material:${{ github.event.inputs.image_tag }}" >> $GITHUB_OUTPUT
+            if [ "${{ github.event.inputs.push_image }}" = "true" ]; then
+              echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/youtubedl-material:${{ github.event.inputs.image_tag }},ghcr.io/${{ github.repository_owner }}/youtubedl-material:${{ github.event.inputs.image_tag }}" >> $GITHUB_OUTPUT
+            else
+              echo "tags=youtubedl-material:${{ github.event.inputs.image_tag }}" >> $GITHUB_OUTPUT
+            fi
           else
             echo "push=false" >> $GITHUB_OUTPUT
-            echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/youtubedl-material:nightly-pr" >> $GITHUB_OUTPUT
+            echo "tags=youtubedl-material:nightly-pr-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
           fi
 
       - name: build & push images