diff --git a/Makefile b/Makefile
index 14781cd..ac8a24e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,14 +84,14 @@ docker: Dockerfile hooks/build .version
 
 .PHONY: docker-build-push
 docker-build-push: docker
-	docker tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG)
+	docker tag $${DOCKER_REPO/-/}:$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG)
 	test -z "$(DOCKER_PAT)" || \
 		docker login https://$(DOCKER_REGISTRY) -u $(DOCKER_USERNAME) -p $(DOCKER_PAT)
 	docker push $(DOCKER_REGISTRY)/$(DOCKER_REPO):$(DOCKER_TAG)
 	if [[ "$(DOCKER_TAG)" == v*.*.* ]]; then \
 		tag=$(DOCKER_TAG) ; \
-		docker tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):latest ; \
-		docker tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$${tag//.*} ; \
+		docker tag $${DOCKER_REPO/-/}:$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):latest ; \
+		docker tag $${DOCKER_REPO/-/}:$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_REPO):$${tag//.*} ; \
 		docker push $(DOCKER_REGISTRY)/$(DOCKER_REPO):latest ; \
 		docker push $(DOCKER_REGISTRY)/$(DOCKER_REPO):$${tag//.*} ; \
 	fi
diff --git a/hooks/build b/hooks/build
index f6a94cb..c100872 100755
--- a/hooks/build
+++ b/hooks/build
@@ -18,5 +18,5 @@ docker build \
 	--build-arg REVISION="$REVISION" \
 	--build-arg VERSION="${1:-$REVISION}" \
 	--build-arg RUNTIME_DEPS="$RUNTIME_DEPS" \
-	--tag $DOCKER_REPO:$DOCKER_TAG \
+	--tag ${DOCKER_REPO/-/}:$DOCKER_TAG \
 	./