diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index caf9889a..2d021598 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -224,8 +224,12 @@ jobs:
           context: .
           platforms: linux/amd64, linux/arm64 #,linux/arm
           push: true
-          tags: ghcr.io/${{github.repository}}:${{format('{0}', github.ref_name)}}, ghcr.io/${{github.repository}}:latest
+          tags: ghcr.io/${{github.repository}}:${{format('v{0}', github.event.inputs.tag)}}, ${{env.LATEST_TAG}}
           labels: org.opencontainers.image.title=Docker
+          build-args: |
+            app_version=${{github.event.inputs.tag}}
+        env:
+          LATEST_TAG: ${{ github.event.inputs.is_latest == 'true' && format('ghcr.io/{0}:latest', github.repository) || '' }}
 
   build-pyinstaller:
     name: Build binary on ${{ matrix.os }}