diff --git a/Makefile b/Makefile
index 78a34a8..88f2c17 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,15 @@ MAKEFLAGS += --silent
 
 .PHONY: *
 
+REPOSITORY=fedy95/baseimage:yamllint
 YAMLLINT_TAG=latest
 
 build_yamllint:
-	docker build -t fedy95/baseimage:yamllint-${YAMLLINT_TAG} image -f image/Dockerfile
+	docker build -t ${REPOSITORY}-${YAMLLINT_TAG} image -f image/Dockerfile
 
 lint: build_yamllint
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data fedy95/baseimage:yamllint-latest .
+	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data ${REPOSITORY}-${YAMLLINT_TAG} .
 lint_help: build_yamllint
-	docker run --rm -v $(pwd):/data fedy95/baseimage:yamllint-latest --help
+	docker run --rm -v $(pwd):/data ${REPOSITORY}-${YAMLLINT_TAG} --help
 
 .DEFAULT_GOAL := build_yamllint