diff --git a/Makefile b/Makefile
index 2e8ac81506..bb92331e84 100644
--- a/Makefile
+++ b/Makefile
@@ -87,15 +87,35 @@ generate-api-docs:
 ##################################
 # CLI
 ##################################
+.PHONY: docker-build-cli docker-tag-repo-cli docker-push-cli
 CLI_PATH := cmd/cli/kubectl-kyverno
+KYVERNO_CLI_IMAGE := kyverno-cli
+
 cli:
 	GOOS=$(GOOS) go build -o $(PWD)/$(CLI_PATH)/kyverno -ldflags=$(LD_FLAGS) $(PWD)/$(CLI_PATH)/main.go
 
+docker-publish-cli: docker-build-cli  docker-tag-repo-cli  docker-push-cli
+
+docker-build-cli:
+	CGO_ENABLED=0 GOOS=linux go build -o $(PWD)/$(CLI_PATH)/kyverno -ldflags=$(LD_FLAGS) $(PWD)/$(CLI_PATH)/main.go
+	@docker build -f $(PWD)/$(CLI_PATH)/Dockerfile -t $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):$(IMAGE_TAG) $(PWD)/$(CLI_PATH)
+
+docker-tag-repo-cli:
+	@echo "docker tag $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):$(IMAGE_TAG) $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):latest"
+	@docker tag $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):$(IMAGE_TAG) $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):latest
+
+docker-push-cli:
+	@docker push $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):$(IMAGE_TAG)
+	@docker push $(REGISTRY)/nirmata/$(KYVERNO_CLI_IMAGE):latest
 
 ##################################
-docker-publish-all: docker-publish-initContainer docker-publish-kyverno
+docker-publish-all: docker-publish-initContainer docker-publish-kyverno docker-publish-cli
 
-docker-build-all: docker-build-initContainer docker-build-kyverno
+docker-build-all: docker-build-initContainer docker-build-kyverno docker-build-cli
+
+##################################
+# CI Testing
+##################################
 
 ci:
 	echo "kustomize input"
diff --git a/cmd/cli/kubectl-kyverno/Dockerfile b/cmd/cli/kubectl-kyverno/Dockerfile
new file mode 100644
index 0000000000..edb70fb2a7
--- /dev/null
+++ b/cmd/cli/kubectl-kyverno/Dockerfile
@@ -0,0 +1,3 @@
+FROM scratch
+ADD kyverno /kyverno
+ENTRYPOINT ["/kyverno"]