diff --git a/.github/workflows/server-publish.yml b/.github/workflows/server-publish.yml
index d728a3e3c2..5badbff201 100644
--- a/.github/workflows/server-publish.yml
+++ b/.github/workflows/server-publish.yml
@@ -32,7 +32,7 @@ jobs:
                   image: server
                   registry: ghcr.io
                   enableBuildKit: true
-                  buildArgs: GIT_COMMIT=${GITHUB_SHA}
-                  tags: ${GITHUB_SHA}, latest
+                  buildArgs: GIT_COMMIT=$${ inputs.commit }}
+                  tags: ${{ inputs.commit }}, latest
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}