diff --git a/hack/.golint_failures b/hack/.golint_failures
index b5c306855f9..5cbb9d97057 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -381,6 +381,7 @@ pkg/volume/azure_dd
 pkg/volume/azure_file
 pkg/volume/cephfs
 pkg/volume/configmap
+pkg/volume/csi/fake
 pkg/volume/empty_dir
 pkg/volume/fc
 pkg/volume/flexvolume
diff --git a/pkg/volume/csi/csi_client.go b/pkg/volume/csi/csi_client.go
index b83ead84734..225ad7a48bd 100644
--- a/pkg/volume/csi/csi_client.go
+++ b/pkg/volume/csi/csi_client.go
@@ -122,11 +122,11 @@ func (c *csiDriverClient) AssertSupportedVersion(ctx grpctx.Context, ver *csipb.
 	// also the minor number. If our supported version is >= 1.X.X
 	// then check only the major number.
 	for _, v := range vers {
-		if ver.GetMajor() == uint32(0) &&
+		if ver.GetMajor() == int32(0) &&
 			(ver.GetMajor() == v.GetMajor() && ver.GetMinor() == v.GetMinor()) {
 			supported = true
 			break
-		} else if ver.GetMajor() != uint32(0) && ver.GetMajor() == v.GetMajor() {
+		} else if ver.GetMajor() != int32(0) && ver.GetMajor() == v.GetMajor() {
 			supported = true
 			break
 		}
@@ -176,12 +176,12 @@ func (c *csiDriverClient) NodePublishVolume(
 	}
 
 	req := &csipb.NodePublishVolumeRequest{
-		Version:           csiVersion,
-		VolumeId:          volID,
-		TargetPath:        targetPath,
-		Readonly:          readOnly,
-		PublishVolumeInfo: volumeInfo,
-		VolumeAttributes:  volumeAttribs,
+		Version:          csiVersion,
+		VolumeId:         volID,
+		TargetPath:       targetPath,
+		Readonly:         readOnly,
+		PublishInfo:      volumeInfo,
+		VolumeAttributes: volumeAttribs,
 
 		VolumeCapability: &csipb.VolumeCapability{
 			AccessMode: &csipb.VolumeCapability_AccessMode{
diff --git a/pkg/volume/csi/fake/fake_client.go b/pkg/volume/csi/fake/fake_client.go
index 80a9023f475..2e0788e929a 100644
--- a/pkg/volume/csi/fake/fake_client.go
+++ b/pkg/volume/csi/fake/fake_client.go
@@ -136,8 +136,8 @@ func (f *NodeClient) NodeUnpublishVolume(ctx context.Context, req *csipb.NodeUnp
 	return &csipb.NodeUnpublishVolumeResponse{}, nil
 }
 
-// GetNodeID implements method
-func (f *NodeClient) GetNodeID(ctx context.Context, in *csipb.GetNodeIDRequest, opts ...grpc.CallOption) (*csipb.GetNodeIDResponse, error) {
+// NodeGetId implements method
+func (f *NodeClient) NodeGetId(ctx context.Context, in *csipb.NodeGetIdRequest, opts ...grpc.CallOption) (*csipb.NodeGetIdResponse, error) {
 	return nil, nil
 }
 
diff --git a/test/e2e/storage/csi_hostpath.go b/test/e2e/storage/csi_hostpath.go
index ddf38f12322..bddc8dc6aa2 100644
--- a/test/e2e/storage/csi_hostpath.go
+++ b/test/e2e/storage/csi_hostpath.go
@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	csiHostPathPluginImage string = "docker.io/k8scsi/hostpathplugin:0.1"
+	csiHostPathPluginImage string = "quay.io/k8scsi/hostpathplugin:v0.2.0"
 )
 
 func csiHostPathPod(
diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go
index 3e764fad429..b6aad07376d 100644
--- a/test/e2e/storage/csi_volumes.go
+++ b/test/e2e/storage/csi_volumes.go
@@ -34,9 +34,9 @@ import (
 )
 
 const (
-	csiExternalAttacherImage    string = "docker.io/k8scsi/csi-attacher:0.1"
-	csiExternalProvisionerImage string = "docker.io/k8scsi/csi-provisioner:0.1"
-	csiDriverRegistrarImage     string = "docker.io/k8scsi/driver-registrar"
+	csiExternalAttacherImage    string = "quay.io/k8scsi/csi-attacher:v0.2.0"
+	csiExternalProvisionerImage string = "quay.io/k8scsi/csi-provisioner:v0.2.0"
+	csiDriverRegistrarImage     string = "quay.io/k8scsi/driver-registrar:v0.2.0"
 )
 
 func externalAttacherServiceAccount(