diff --git a/labs/docker/Makefile b/labs/docker/Makefile
index 63d7fb33b4acdddd21284585f94c651199b5ecf5..8193e70121412c43a09c99342d6f656f844f9fa0 100644
--- a/labs/docker/Makefile
+++ b/labs/docker/Makefile
@@ -10,7 +10,7 @@ BUILD_VERSION?=
 BUILD_IMAGE=0
 IMAGE_ACCOUNT?=
 IMAGE_REPO?=
-IMAGE_TAG=latest
+IMAGE_TAG?=latest
 TAG_REVISION?=0
 
 all: release
@@ -21,6 +21,7 @@ image:
 		if [ "$(IMAGE_ACCOUNT)" != "" ]; then \
 			if [ "$(IMAGE_REPO)" != "" ]; then \
 				docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME); \
+				docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME)-$(IMAGE_TAG); \
 				if [ "$(TAG_REVISION)" == "1" ]; then \
 					docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_ACCOUNT)/$(IMAGE_REPO):$(IMAGE_NAME)-$(BUILD_REVISION); \
 				fi \
@@ -28,6 +29,7 @@ image:
 		else \
 			if [ "$(IMAGE_REPO)" != "" ]; then \
 				docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME); \
+				docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME)-$(IMAGE_TAG); \
 				if [ "$(TAG_REVISION)" == "1" ]; then \
 					docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(IMAGE_REPO):$(IMAGE_NAME)-$(BUILD_REVISION); \
 				fi \