diff --git a/test/e2e/framework/volume_util.go b/test/e2e/framework/volume_util.go
index 6b5c094655..c5cdb317b6 100644
--- a/test/e2e/framework/volume_util.go
+++ b/test/e2e/framework/volume_util.go
@@ -206,7 +206,7 @@ func NewISCSIServer(cs clientset.Interface, namespace string) (config VolumeTest
 			"/srv/iscsi": "/srv/iscsi",
 		},
 		ServerReadyMessage: "iscsi target started",
-		ServerHostNetwork: true,
+		ServerHostNetwork:  true,
 	}
 	pod, ip = CreateStorageServer(cs, config)
 	// Make sure the client runs on the same node as server so we don't need to open any firewalls.
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 39017e750d..b37860e1c0 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -238,9 +238,9 @@ func initImageConfigs() map[int]Config {
 	configs[ServeHostname] = Config{e2eRegistry, "serve-hostname", "1.1"}
 	configs[TestWebserver] = Config{e2eRegistry, "test-webserver", "1.0"}
 	configs[VolumeNFSServer] = Config{e2eRegistry, "volume/nfs", "1.0"}
-	configs[VolumeISCSIServer] = Config{e2eRegistry, "volume/iscsi", "2.0"}
+	configs[VolumeISCSIServer] = Config{"quay.io", "jsafrane/iscsi-test", "2.0"}
 	configs[VolumeGlusterServer] = Config{e2eRegistry, "volume/gluster", "1.0"}
-	configs[VolumeRBDServer] = Config{e2eRegistry, "volume/rbd", "1.0.1"}
+	configs[VolumeRBDServer] = Config{"quay.io", "jsafrane/rbd-test", "2.0"}
 	return configs
 }