diff --git a/Makefile b/Makefile
index 0dc8242..c710abe 100644
--- a/Makefile
+++ b/Makefile
@@ -6,23 +6,23 @@ TAG?=latest
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 build:
-	docker build -t openfaas-incubator/mqtt-connector:$(TAG)-amd64 . -f Dockerfile
-	docker build --build-arg OPTS="GOARCH=arm64" -t openfaas-incubator/mqtt-connector:$(TAG)-arm64 . -f Dockerfile
-	docker build --build-arg OPTS="GOARCH=arm GOARM=6" -t openfaas-incubator/mqtt-connector:$(TAG)-armhf . -f Dockerfile
+	docker build -t openfaas/mqtt-connector:$(TAG)-amd64 . -f Dockerfile
+	docker build --build-arg OPTS="GOARCH=arm64" -t openfaas/mqtt-connector:$(TAG)-arm64 . -f Dockerfile
+	docker build --build-arg OPTS="GOARCH=arm GOARM=6" -t openfaas/mqtt-connector:$(TAG)-armhf . -f Dockerfile
 
 push:
-	docker push openfaas-incubator/mqtt-connector:$(TAG)-amd64
-	docker push openfaas-incubator/mqtt-connector:$(TAG)-arm64
-	docker push openfaas-incubator/mqtt-connector:$(TAG)-armhf
+	docker push openfaas/mqtt-connector:$(TAG)-amd64
+	docker push openfaas/mqtt-connector:$(TAG)-arm64
+	docker push openfaas/mqtt-connector:$(TAG)-armhf
 
 manifest:
-	docker manifest create --amend openfaas-incubator/mqtt-connector:$(TAG) \
-		openfaas-incubator/mqtt-connector:$(TAG)-amd64 \
-		openfaas-incubator/mqtt-connector:$(TAG)-arm64 \
-		openfaas-incubator/mqtt-connector:$(TAG)-armhf
-	docker manifest annotate openfaas-incubator/mqtt-connector:$(TAG) openfaas-incubator/mqtt-connector:$(TAG)-arm64 --os linux --arch arm64
-	docker manifest annotate openfaas-incubator/mqtt-connector:$(TAG) openfaas-incubator/mqtt-connector:$(TAG)-armhf --os linux --arch arm --variant v6
-	docker manifest push -p openfaas-incubator/mqtt-connector:$(TAG)
+	docker manifest create --amend openfaas/mqtt-connector:$(TAG) \
+		openfaas/mqtt-connector:$(TAG)-amd64 \
+		openfaas/mqtt-connector:$(TAG)-arm64 \
+		openfaas/mqtt-connector:$(TAG)-armhf
+	docker manifest annotate openfaas/mqtt-connector:$(TAG) openfaas/mqtt-connector:$(TAG)-arm64 --os linux --arch arm64
+	docker manifest annotate openfaas/mqtt-connector:$(TAG) openfaas/mqtt-connector:$(TAG)-armhf --os linux --arch arm --variant v6
+	docker manifest push -p openfaas/mqtt-connector:$(TAG)
 
 test:
 	go test ./...