diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go
index 233038d46b1..5c3099c8208 100644
--- a/test/e2e/framework/test_context.go
+++ b/test/e2e/framework/test_context.go
@@ -113,6 +113,8 @@ type TestContextType struct {
 	FeatureGates map[string]bool
 	// Node e2e specific test context
 	NodeTestContextType
+	// Storage e2e specific test context
+	StorageTestContextType
 	// Monitoring solution that is used in current cluster.
 	ClusterMonitoringMode string
 	// Separate Prometheus monitoring deployed in cluster
@@ -160,6 +162,14 @@ type NodeTestContextType struct {
 	SystemSpecName string
 }
 
+// StorageConfig contains the shared settings for storage 2e2 tests.
+type StorageTestContextType struct {
+	// CSIImageVersion overrides the builtin stable version numbers if set.
+	CSIImageVersion string
+	// CSIImageRegistry defines the image registry hosting the CSI container images.
+	CSIImageRegistry string
+}
+
 type CloudConfig struct {
 	ApiEndpoint       string
 	ProjectID         string
@@ -293,6 +303,11 @@ func RegisterNodeFlags() {
 	flag.StringVar(&TestContext.SystemSpecName, "system-spec-name", "", "The name of the system spec (e.g., gke) that's used in the node e2e test. The system specs are in test/e2e_node/system/specs/. This is used by the test framework to determine which tests to run for validating the system requirements.")
 }
 
+func RegisterStorageFlags() {
+	flag.StringVar(&TestContext.CSIImageVersion, "csiImageVersion", "", "overrides the default tag used for hostpathplugin/csi-attacher/csi-provisioner/driver-registrar images")
+	flag.StringVar(&TestContext.CSIImageRegistry, "csiImageRegistry", "quay.io/k8scsi", "overrides the default repository used for hostpathplugin/csi-attacher/csi-provisioner/driver-registrar images")
+}
+
 // ViperizeFlags sets up all flag and config processing. Future configuration info should be added to viper, not to flags.
 func ViperizeFlags() {
 
@@ -301,6 +316,7 @@ func ViperizeFlags() {
 	// since go test 'flag's are sort of incompatible w/ flag, glog, etc.
 	RegisterCommonFlags()
 	RegisterClusterFlags()
+	RegisterStorageFlags()
 	flag.Parse()
 
 	// Part 2: Set Viper provided flags.
diff --git a/test/e2e/storage/csi_objects.go b/test/e2e/storage/csi_objects.go
index d888abdbb5c..15fd7cf3282 100644
--- a/test/e2e/storage/csi_objects.go
+++ b/test/e2e/storage/csi_objects.go
@@ -37,12 +37,23 @@ import (
 	. "github.com/onsi/ginkgo"
 )
 
-const (
-	csiHostPathPluginImage      string = "quay.io/k8scsi/hostpathplugin:v0.2.0"
-	csiExternalAttacherImage    string = "quay.io/k8scsi/csi-attacher:v0.2.0"
-	csiExternalProvisionerImage string = "quay.io/k8scsi/csi-provisioner:v0.2.1"
-	csiDriverRegistrarImage     string = "quay.io/k8scsi/driver-registrar:v0.2.0"
-)
+var csiImageVersions = map[string]string{
+	"hostpathplugin":   "v0.2.0",
+	"csi-attacher":     "v0.2.0",
+	"csi-provisioner":  "v0.2.1",
+	"driver-registrar": "v0.2.0",
+}
+
+func csiContainerImage(image string) string {
+	var fullName string
+	fullName += framework.TestContext.CSIImageRegistry + "/" + image + ":"
+	if framework.TestContext.CSIImageVersion != "" {
+		fullName += framework.TestContext.CSIImageVersion
+	} else {
+		fullName += csiImageVersions[image]
+	}
+	return fullName
+}
 
 // Create the driver registrar cluster role if it doesn't exist, no teardown so that tests
 // are parallelizable. This role will be shared with many of the CSI tests.
@@ -207,7 +218,7 @@ func csiHostPathPod(
 			Containers: []v1.Container{
 				{
 					Name:            "external-provisioner",
-					Image:           csiExternalProvisionerImage,
+					Image:           csiContainerImage("csi-provisioner"),
 					ImagePullPolicy: v1.PullAlways,
 					Args: []string{
 						"--v=5",
@@ -223,7 +234,7 @@ func csiHostPathPod(
 				},
 				{
 					Name:            "driver-registrar",
-					Image:           csiDriverRegistrarImage,
+					Image:           csiContainerImage("driver-registrar"),
 					ImagePullPolicy: v1.PullAlways,
 					Args: []string{
 						"--v=5",
@@ -248,7 +259,7 @@ func csiHostPathPod(
 				},
 				{
 					Name:            "external-attacher",
-					Image:           csiExternalAttacherImage,
+					Image:           csiContainerImage("csi-attacher"),
 					ImagePullPolicy: v1.PullAlways,
 					Args: []string{
 						"--v=5",
@@ -269,7 +280,7 @@ func csiHostPathPod(
 				},
 				{
 					Name:            "hostpath-driver",
-					Image:           csiHostPathPluginImage,
+					Image:           csiContainerImage("hostpathplugin"),
 					ImagePullPolicy: v1.PullAlways,
 					SecurityContext: &v1.SecurityContext{
 						Privileged: &priv,