diff --git a/Makefile b/Makefile
index d1e3cc44..3632e31e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,14 +13,16 @@ build-alpine:
 	docker build -f Dockerfile-alpine -t $(BUILD_TAG) .
 .PHONY: build-alpine
 
+NIGHTLY_TAG := jakzal/phpqa-nightly:$(shell date +%y%m%d)
 build-nightly-latest:
-	docker build -t jakzal/phpqa-nightly:$(shell date +%y%m%d) .
+	docker build -t $(NIGHTLY_TAG) .
 	@docker login -u jakzal -p ${DOCKER_HUB_PASSWORD}
-	docker push $(BUILD_TAG)
+	docker push $(NIGHTLY_TAG)
 .PHONY: build-nightly-latest
 
+NIGHTLY_ALPINE_TAG := jakzal/phpqa-nightly:$(shell date +%y%m%d)-alpine
 build-nightly-alpine:
-	docker build -f Dockerfile-alpine -t jakzal/phpqa-nightly:$(shell date +%y%m%d)-alpine .
+	docker build -f Dockerfile-alpine -t $(NIGHTLY_ALPINE_TAG) .
 	@docker login -u jakzal -p ${DOCKER_HUB_PASSWORD}
-	docker push $(BUILD_TAG)
+	docker push $(NIGHTLY_ALPINE_TAG)
 .PHONY: build-nightly-alpine