diff --git a/Makefile b/Makefile
index 3f6205bb..b8c30a76 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,11 @@ ifndef PUBLISH
 override IMAGE_VERSION := e2e-$(GIT_COMMIT)
 endif
 endif
-IMAGE_NAME = nfsplugin
+IMAGENAME ?= nfsplugin
 REGISTRY ?= andyzhangx
-REGISTRY_NAME = $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
-IMAGE_TAG = $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
+REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
+IMAGE_TAG = $(REGISTRY)/$(IMAGENAME):$(IMAGE_VERSION)
+IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGENAME):latest
 
 all: nfs
 
@@ -91,6 +92,11 @@ container: nfs
 push:
 	docker push $(IMAGE_TAG)
 
+.PHONY: push-latest
+push-latest:
+	docker tag $(IMAGE_TAG) $(IMAGE_TAG_LATEST)
+	docker push $(IMAGE_TAG_LATEST)
+
 .PHONY: install-nfs-server
 install-nfs-server:
 	kubectl apply -f ./deploy/example/nfs-provisioner/nfs-server.yaml
@@ -103,7 +109,7 @@ install-helm:
 e2e-bootstrap: install-helm
 	docker pull $(IMAGE_TAG) || make container push
 	helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \
-	--set image.nfs.repository=$(REGISTRY)/$(IMAGE_NAME) \
+	--set image.nfs.repository=$(REGISTRY)/$(IMAGENAME) \
 	--set image.nfs.tag=$(IMAGE_VERSION) \
 	--set image.nfs.pullPolicy=Always
 
diff --git a/hack/release-image.sh b/hack/release-image.sh
index a272656d..9c026371 100755
--- a/hack/release-image.sh
+++ b/hack/release-image.sh
@@ -23,15 +23,14 @@ fi
 
 export REGISTRY_NAME="$1"
 export REGISTRY=$REGISTRY_NAME.azurecr.io
-export IMAGE_NAME=gcr.io/k8s-staging-sig-storage/nfsplugin
+export IMAGENAME=public/k8s/csi/nfs-csi
 export CI=1
 export PUBLISH=1
 az acr login --name $REGISTRY_NAME
-make container
-make push
+make container push push-latest
 
 echo "sleep 60s ..."
 sleep 60
-image="gcr.io/k8s-staging-sig-storage/nfsplugin:latest"
+image="mcr.microsoft.com/k8s/csi/nfs-csi:latest"
 docker pull $image
 docker inspect $image | grep Created