diff --git a/Makefile b/Makefile
index 1970d9b0d6..cf83313567 100755
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,9 @@ protos:
 ## Docker
 ##
 DOCKER_PROFILE ?= openbazaar
-DOCKER_SERVER_IMAGE_NAME ?= $(DOCKER_PROFILE)/server
-DOCKER_DUMMY_IMAGE_NAME ?= $(DOCKER_PROFILE)/server_dummy
+DOCKER_SERVER_VERSION ?= $(shell git describe --tags --abbrev=0)
+DOCKER_SERVER_IMAGE_NAME ?= $(DOCKER_PROFILE)/server:$(DOCKER_SERVER_VERSION)
+DOCKER_DUMMY_IMAGE_NAME ?= $(DOCKER_PROFILE)/server_dummy:$(DOCKER_SERVER_VERSION)
 
 docker:
 	docker build -t $(DOCKER_SERVER_IMAGE_NAME) .