diff --git a/Makefile b/Makefile
index 7ebb05c..4d19f2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER)
 
 ifeq ($(GIT_BRANCH), origin/develop)
-DOCKER_TAGS += $(PACKAGE_VERSION)
+DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))
 DOCKER_TAGS += latest
 else
-DOCKER_TAGS += $(PACKAGE_VERSION)-$(subst /,-,$(GIT_BRANCH))
+DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH))
 endif
 
 DOCKER_REPO = $(COMPANY_NAME)/4testing-$(PRODUCT_NAME)
@@ -18,7 +18,7 @@ $(DOCKER_TARGETS): $(DEB_REPO_DATA)
 	sed "s|{{GIT_BRANCH}}|$(GIT_BRANCH)|"  -i Dockerfile
 	sed 's/{{PACKAGE_VERSION}}/'$(PACKAGE_VERSION)'/'  -i Dockerfile
 
-	sudo docker build -t $(subst -,.,$(subst $(COLON),:,$@)) . &&\
+	sudo docker build -t $(subst $(COLON),:,$@) . &&\
 	mkdir -p $$(dirname $@) &&\
 	echo "Done" > $@
 
@@ -31,4 +31,4 @@ clean-docker:
 	sudo docker rmi -f $$(sudo docker images -q $(COMPANY_NAME)/*) || exit 0
 
 deploy: $(DOCKER_TARGETS)
-	$(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst -,.,$(subst $(COLON),:,$(TARGET)));)
+	$(foreach TARGET,$(DOCKER_TARGETS),sudo docker push $(subst $(COLON),:,$(TARGET));)