diff --git a/hooks/build b/hooks/build
index 7076d98f7..dfa5efd70 100755
--- a/hooks/build
+++ b/hooks/build
@@ -10,9 +10,10 @@ if [[ $DOCKER_TAG == v* ]]; then
   # it's only a release tag, let's use that as the version
   VERSION=${DOCKER_TAG}
 else
-  # for everything else use branch-commit as the version, e.g.
-  # master-abcdef
-  VERSION=${SOURCE_BRANCH}-${SOURCE_COMMIT:-latest}
+  # for everything else generate version from branch name and git tag/commit
+  # it would be best to use SOURCE_COMMIT here, but it doesn't work
+  # see https://github.com/docker/hub-feedback/issues/600
+  VERSION=$(git describe --tags --always)-${SOURCE_BRANCH}
 fi
 
 docker build --build-arg VERSION=${VERSION} -t ${IMAGE_NAME} .