diff --git a/Makefile b/Makefile
index 23e21bd..a344a9f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,14 @@ YAMLLINT_TAG=baseimage-yamllint:latest
 lint: lint-json lint-yaml
 
 build-jsonlint:
-	docker build -t ${LOCAL_REPOSITORY}/${TAG} image -f image/Dockerfile
+	docker build -t ${LOCAL_REPOSITORY}-${JSONLINT_TAG} image -f image/Dockerfile
 lint-json: build-jsonlint
 	docker run --rm -it -v $(PWD):/data ${LOCAL_REPOSITORY}-${JSONLINT_TAG} -qc tests/general.json
 lint-json-help: build-jsonlint
 	docker run --rm -it -v $(PWD):/data ${LOCAL_REPOSITORY}-${JSONLINT_TAG} --help
 
 lint-yaml:
-	docker pull "${REGISTRY}"/"${YAMLLINT_TAG}"
-	docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" .
+	docker pull ${REGISTRY}/${YAMLLINT_TAG}
+	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG} .
 
 .DEFAULT_GOAL := lint