diff --git a/Makefile b/Makefile
index eb90ce8..337e829 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,11 @@ clean:
 	rm -rf oc-monitord
 
 docker:
-	DOCKER_BUILDKIT=1 docker build -t oc/oc-monitord:0.0.1 -f Dockerfile .
-	docker tag oc/oc-monitord:0.0.1 oc/oc-monitord:latest
-	docker tag oc/oc-monitord:0.0.1 oc-monitord:latest
+	DOCKER_BUILDKIT=1 docker build -t oc-monitord: -f Dockerfile .
+	docker tag oc-monitord oc/oc-monitord:0.0.1
 
 publish-kind:
-	kind load docker-image oc/oc-monitord:0.0.1 --name opencloud
+	kind load docker-image oc/oc-monitord:0.0.1 --name opencloud | true
 
 publish-registry:
 	@echo "TODO"