diff --git a/Dockerfile b/Dockerfile
index 4a31f45df..1168e390b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,10 @@ COPY --from=jsbuilder /src/build/* /src/ui/build/
 COPY --from=jsbuilder /src/build/static/css/* /src/ui/build/static/css/
 COPY --from=jsbuilder /src/build/static/js/* /src/ui/build/static/js/
 RUN rm -rf /src/build/css /src/build/js
-RUN go-bindata -fs -prefix ui/build -tags embed -nocompress -pkg assets -o assets/embedded_gen.go ui/build/...\
-    && go build -ldflags="-X main.gitSha=${SOURCE_COMMIT} -X main.gitTag=${SOURCE_BRANCH}" -tags=embed
+RUN GIT_SHA=$(git rev-parse --short HEAD) && \
+    GIT_TAG=$(git describe --tags --abbrev=0 2> /dev/null) && \
+    go-bindata -fs -prefix ui/build -tags embed -nocompress -pkg assets -o assets/embedded_gen.go ui/build/... && \
+    go build -ldflags="-X main.gitSha=${GIT_SHA} -X main.gitTag=${GIT_TAG}" -tags=embed
 
 #####################################################
 ### Build Final Image