diff --git a/Makefile b/Makefile
index cf9aae897..99543d579 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@
 STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
 STAGINGVERSION=latest
 
-PRODIMAGE=gcr.io/google-containers/volume-csi/compute-persistent-disk-csi-driver
-PRODVERSION=v0.2.0.alpha
+PRODIMAGE=gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver
+PRODVERSION=v0.1.0.alpha
 
 all: gce-pd-driver
 
@@ -26,7 +26,6 @@ gce-pd-driver:
 	go test -c sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e -o bin/e2e.test
 
 build-container:
-# TODO CHANGE PRODVERSION TO STAGINGVERSION AFTER TESTING
 	docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
 
 push-container: build-container
@@ -39,4 +38,4 @@ prod-push-container: prod-build-container
 	gcloud docker -- push $(PRODIMAGE):$(PRODVERSION)
 
 test-sanity: gce-pd-driver
-	go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
\ No newline at end of file
+	go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
diff --git a/deploy/kubernetes/controller.yaml b/deploy/kubernetes/controller.yaml
index 18bb0c0eb..c3d8d28c0 100644
--- a/deploy/kubernetes/controller.yaml
+++ b/deploy/kubernetes/controller.yaml
@@ -42,7 +42,7 @@ spec:
               mountPath: /csi
         - name: gce-pd-driver
           imagePullPolicy: Always
-          image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
+          image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/deploy/kubernetes/node.yaml b/deploy/kubernetes/node.yaml
index 77f884360..145d2bf3b 100644
--- a/deploy/kubernetes/node.yaml
+++ b/deploy/kubernetes/node.yaml
@@ -36,7 +36,7 @@ spec:
           securityContext:
             privileged: true
           imagePullPolicy: Always
-          image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
+          image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
@@ -73,4 +73,4 @@ spec:
         - name: device-dir
           hostPath:
             path: /dev
-            type: Directory
\ No newline at end of file
+            type: Directory
diff --git a/pkg/gce-pd-csi-driver/controller_test.go b/pkg/gce-pd-csi-driver/controller_test.go
index 3d91c02c6..716894f74 100644
--- a/pkg/gce-pd-csi-driver/controller_test.go
+++ b/pkg/gce-pd-csi-driver/controller_test.go
@@ -213,7 +213,7 @@ func TestDeleteVolume(t *testing.T) {
 			req: &csi.DeleteVolumeRequest{
 				VolumeId: testVolumeId + "/foo",
 			},
-			expErr: true,
+			expErr: false,
 		},
 	}
 	for _, tc := range testCases {