diff --git a/Makefile b/Makefile
index c8052b4..4cdab2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 default: buildall
 
 VOLUME ?= cloner-test
+TAGOWNER = valicek1
+TAGMAIN = repo-cloner
+TAGBASE= $(TAGOWNER)/$(TAGMAIN)
 
 
 mirror:
-	docker build -t valicek1/repo-cloner-mirror .
+	docker build -t $(TAGBASE)-mirror .
 
 run-mirror: mirror
-	docker run -v $(VOLUME):/data -it --rm valicek1/repo-cloner-mirror
+	docker run -v $(VOLUME):/data -it --rm $(TAGBASE)-mirror