diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e9852840..e6d283c6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,6 +42,7 @@ jobs:
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          echo ::set-output name=sha::${GITHUB_SHA::8}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -62,6 +63,8 @@ jobs:
           # push: ${{ github.event_name != 'pull_request' }}
           push: false
           tags: ${{ steps.info.outputs.tags }}
+          build-args: |
+            COMMIT_SHA=${{ steps.info.outputs.sha }}
           labels: |
             org.opencontainers.image.title=${{ github.event.repository.name }}
             org.opencontainers.image.description=${{ github.event.repository.description }}
diff --git a/Dockerfile b/Dockerfile
index d47be16f..3a84167d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,9 +12,13 @@ ARG GOPROXY
 COPY go.mod go.sum ./
 RUN go mod download
 
+ARG COMMIT_SHA
+
 COPY . .
 
-RUN go build -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=`git describe --always --dirty` -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo
+RUN set -xe && \
+    export COMMIT_SHA=${COMMIT_SHA:-$(git describe --always --dirty)} && \
+    go build -ldflags "-s -w -X github.com/drakkan/sftpgo/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/version.date=`date -u +%FT%TZ`" -o sftpgo
 
 
 FROM alpine:3.12