diff --git a/Makefile b/Makefile
index f02b05b0..8b618459 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME = tvial/docker-mailserver:testing
 VCS_REF := $(shell git rev-parse --short HEAD)
-VCS_VERSION := $(shell git describe)
+VCS_VERSION := $(shell git describe --tags --contains --always)
 
 all: build backup generate-accounts run generate-accounts-after-run fixtures tests clean
 no-build: backup generate-accounts run generate-accounts-after-run fixtures tests clean
diff --git a/hooks/build b/hooks/build
index 4cfbe0f0..e45a55c5 100755
--- a/hooks/build
+++ b/hooks/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 VCS_REF=$(git rev-parse --short HEAD)
-VCS_VERSION=$(git describe)
+VCS_VERSION=$(git describe --tags --contains --always)
 
 docker build \
 	--build-arg VCS_REF="$VCS_REF" \