diff --git a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml
index 033c122451c6..2c489887e9c3 100644
--- a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml
@@ -12,9 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
+      testgrid-dashboards: sig-storage-csi-other
       testgrid-tab-name: pull-kubernetes-csi-csi-driver-flex
-      description: Kubernetes-CSI pull job on csi-driver-flex
+      description: Kubernetes-CSI pull job in repo csi-driver-flex
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml
index 16f37fe28300..b782b561de0c 100644
--- a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml
@@ -12,6 +12,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,7 +29,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -51,6 +55,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.14 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -84,6 +92,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -97,7 +109,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -123,6 +135,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -156,6 +172,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -169,7 +189,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -195,6 +215,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -228,6 +252,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-csi-driver-host-path
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo csi-driver-host-path for unit tests
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -264,10 +292,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "false"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.14-on-1.14
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and 1.14 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -304,10 +332,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "false"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.14-on-1.15
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and 1.14 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes 1.15
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -344,10 +372,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.14-on-master
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes master and 1.14 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes master
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -384,10 +412,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "false"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.15-on-1.14
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and 1.15 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes 1.14
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -424,10 +452,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "false"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.15-on-1.15
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and 1.15 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -464,10 +492,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: 1.15-on-master
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes master and 1.15 sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes master
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -504,10 +532,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "false"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: alpha-1.15-on-1.15
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI alpha tests with Kubernetes 1.15 and 1.15 sidecars
+    description: periodic Kubernetes-CSI job for alpha tests, using deployment 1.15 on Kubernetes 1.15
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -544,10 +572,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: canary-on-1.14
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and canary sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes 1.14
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -590,10 +618,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: canary-on-1.15
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and canary sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes 1.15
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -636,10 +664,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: canary-on-master
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI non-alpha tests with Kubernetes master and canary sidecars
+    description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes master
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -682,10 +710,10 @@ periodics:
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
   annotations:
-    testgrid-dashboards: sig-storage-csi
+    testgrid-dashboards: sig-storage-csi-ci
     testgrid-tab-name: alpha-canary-on-master
     testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI alpha tests with Kubernetes master and canary sidecars
+    description: periodic Kubernetes-CSI job for alpha tests, using deployment canary on Kubernetes master
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml
index a7bcd28375ab..f9680939e0f7 100644
--- a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml
@@ -12,9 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
+      testgrid-dashboards: sig-storage-csi-other
       testgrid-tab-name: pull-kubernetes-csi-csi-lib-utils
-      description: Kubernetes-CSI pull job on csi-lib-utils
+      description: Kubernetes-CSI pull job in repo csi-lib-utils
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
index 7b65a79f97f2..0a3deb084be3 100644
--- a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
@@ -12,9 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
+      testgrid-dashboards: sig-storage-csi-other
       testgrid-tab-name: pull-kubernetes-csi-csi-proxy
-      description: Kubernetes-CSI pull job on csi-proxy
+      description: Kubernetes-CSI pull job in repo csi-proxy
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml
index a464b0e9803f..245a8fc4d823 100644
--- a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml
@@ -12,9 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
+      testgrid-dashboards: sig-storage-csi-other
       testgrid-tab-name: pull-kubernetes-csi-csi-release-tools
-      description: Kubernetes-CSI pull job on csi-release-tools
+      description: Kubernetes-CSI pull job in repo csi-release-tools
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
index 8b85607fdd09..fd23db3b0d35 100644
--- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
@@ -6,15 +6,15 @@ presubmits:
     always_run: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(release-0.3|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0|v0.2.0)$"]
+    skip_branches: ["^(release-0.3|release-1.0|v0.1.0|v0.2.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
+      testgrid-dashboards: sig-storage-csi-other
       testgrid-tab-name: pull-kubernetes-csi-csi-test
-      description: Kubernetes-CSI pull job on csi-test
+      description: Kubernetes-CSI pull job in repo csi-test
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
index 909ba209c1f7..e66bb86b40cc 100644
--- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
+++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
@@ -7,11 +7,15 @@ presubmits:
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,7 +29,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -51,6 +55,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.14 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -79,11 +87,15 @@ presubmits:
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -97,7 +109,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -123,6 +135,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -151,11 +167,15 @@ presubmits:
     optional: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -169,7 +189,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -195,6 +215,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -222,12 +246,16 @@ presubmits:
     always_run: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-attacher
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo external-attacher for unit tests
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
index 2194729fde8e..9ff258383ff6 100644
--- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
+++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
@@ -7,11 +7,15 @@ presubmits:
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,7 +29,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -51,6 +55,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.14 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -79,11 +87,15 @@ presubmits:
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -97,7 +109,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -123,6 +135,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -151,11 +167,15 @@ presubmits:
     optional: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-provisioner for alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -169,7 +189,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -195,6 +215,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-provisioner for alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -222,12 +246,16 @@ presubmits:
     always_run: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"]
+    skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-provisioner
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo external-provisioner for unit tests
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
index b1d8a8a8eca9..83b8d5f005f4 100644
--- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
+++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
@@ -2,7 +2,7 @@
 
 presubmits:
   kubernetes-csi/external-resizer:
-  - name: pull-kubernetes-csi-external-resizer
+  - name: pull-kubernetes-csi-external-resizer-1-14-on-kubernetes-1-14
     always_run: true
     optional: false
     decorate: true
@@ -13,9 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer
-      description: Kubernetes-CSI pull non-alpha job in external-resizer
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,8 +25,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
+          value: "1.14.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.14"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -35,7 +42,47 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-resizer-unit
+  - name: pull-kubernetes-csi-external-resizer-1-14-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.14 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-1-15-on-kubernetes-1-15
     always_run: true
     optional: false
     decorate: true
@@ -46,9 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer-unit
-      description: Kubernetes-CSI pull unit job in external-resizer
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -58,18 +105,65 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
-          value: "unit"
+          value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-resizer-alpha
-    always_run: true
+  - name: pull-kubernetes-csi-external-resizer-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.15 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-alpha-1-15-on-kubernetes-1-15
+    always_run: false
     optional: true
     decorate: true
     skip_report: false
@@ -79,9 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer-alpha
-      description: Kubernetes-CSI pull alpha job in external-resizer
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-resizer for alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -91,8 +185,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
@@ -101,3 +202,78 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-alpha-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-resizer for alpha tests, using deployment 1.15 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "serial-alpha parallel-alpha"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-unit
+    always_run: true
+    decorate: true
+    skip_report: false
+    skip_branches: []
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-resizer
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo external-resizer for unit tests
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_TESTS
+          value: "unit"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
index cb8781ca0851..26f3494fe5e8 100644
--- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
+++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
@@ -2,20 +2,20 @@
 
 presubmits:
   kubernetes-csi/external-snapshotter:
-  - name: pull-kubernetes-csi-external-snapshotter
+  - name: pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-1-14
     always_run: true
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"]
+    skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-snapshotter
-      description: Kubernetes-CSI pull non-alpha job in external-snapshotter
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,8 +25,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
+          value: "1.14.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.14"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -35,20 +42,60 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-snapshotter-unit
+  - name: pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.14 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-snapshotter-1-15-on-kubernetes-1-15
     always_run: true
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"]
+    skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-snapshotter-unit
-      description: Kubernetes-CSI pull unit job in external-snapshotter
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -58,30 +105,40 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
-          value: "unit"
+          value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-snapshotter-alpha
-    always_run: true
+  - name: pull-kubernetes-csi-external-snapshotter-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
     optional: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-snapshotter-alpha
-      description: Kubernetes-CSI pull alpha job in external-snapshotter
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -91,8 +148,52 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-snapshotter-alpha-1-15-on-kubernetes-1-15
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"]
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo external-snapshotter for alpha tests, using deployment 1.15 on Kubernetes 1.15
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
@@ -101,3 +202,78 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
+  - name: pull-kubernetes-csi-external-snapshotter-alpha-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo external-snapshotter for alpha tests, using deployment 1.15 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "serial-alpha parallel-alpha"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-snapshotter-unit
+    always_run: true
+    decorate: true
+    skip_report: false
+    skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"]
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-external-snapshotter
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo external-snapshotter for unit tests
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_TESTS
+          value: "unit"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh
index 4fa150a812c6..a81946446a08 100755
--- a/config/jobs/kubernetes-csi/gen-jobs.sh
+++ b/config/jobs/kubernetes-csi/gen-jobs.sh
@@ -25,24 +25,30 @@ latest_stable_k8s_version="1.15.0"
 latest_stable_k8s_minor_version="1.15"
 
 # We need this image because it has Docker in Docker and go.
-dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190906-fc85258-master"
+dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master"
 
 # All kubernetes-csi repos which are part of the hostpath driver example.
-# For these repos we generate the full test matrix.
+# For these repos we generate the full test matrix. For each entry here
+# we need a "sig-storage-<repo>" dashboard in
+# config/testgrids/kubernetes/sig-storage/config.yaml.
 hostpath_example_repos="
 csi-driver-host-path
 external-attacher
 external-provisioner
+external-resizer
+external-snapshotter
+livenessprobe
 node-driver-registrar
 "
 
-# kubernetes-csi repos which only need to be tested against a single
-# Kubernetes version. We generate unit, stable and alpha jobs for these,
-# without specifying a Kubernetes version.
+# kubernetes-csi repos which only need to be tested against at most a
+# single Kubernetes version. We generate unit, stable and alpha jobs
+# for these, without specifying a Kubernetes version. What the repo
+# then tests in those jobs is entirely up to the repo.
+#
+# This list is currently empty, but such a job might be useful again
+# in the future, so the code generator code below is kept.
 single_kubernetes_repos="
-livenessprobe
-external-snapshotter
-external-resizer
 "
 
 # kubernetes-csi repos which only need unit testing.
@@ -61,7 +67,6 @@ csi-proxy
 # csi-driver-nfs
 # csi-lib-fc
 # csi-lib-iscsi
-# external-resizer
 
 # All branches that do *not* support Prow testing. All new branches
 # are expected to have that support, therefore these list should be
@@ -69,11 +74,11 @@ csi-proxy
 # changes each time a new branch gets created.
 skip_branches_cluster_driver_registrar='^(release-1.0)$'
 skip_branches_csi_lib_utils='^(release-0.1|release-0.2)$'
-skip_branches_csi_test='^(release-0.3|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0|v0.2.0)$'
-skip_branches_external_attacher='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$'
-skip_branches_external_provisioner='^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$'
-skip_branches_external_snapshotter='^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$'
-skip_branches_livenessprobe='^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$'
+skip_branches_csi_test='^(release-0.3|release-1.0|v0.1.0|v0.2.0)$'
+skip_branches_external_attacher='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$'
+skip_branches_external_provisioner='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$'
+skip_branches_external_snapshotter='^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$'
+skip_branches_livenessprobe='^(release-0.4|release-1.0)$'
 skip_branches_node_driver_registrar='^(release-1.0)$'
 
 skip_branches () {
@@ -128,7 +133,74 @@ job_name () {
     if [ "$repo" ]; then
         name+="-$repo"
     fi
-    if [ "$tests" != "non-alpha" ]; then
+    name+=$(test_name "$tests" "$deployment" "$kubernetes")
+    echo "$name"
+}
+
+# Generates the testgrid annotations. "ci" jobs all land in the same
+# "sig-storage-csi-ci" and send alert emails, "pull" jobs land in "sig-storage-csi-<repo>"
+# and don't alert. Some repos only have a single pull job. Those
+# land in "sig-storage-csi-other".
+annotations () {
+    local indent="$1"
+    shift
+    local type="$1"
+    local repo="$2"
+    local tests="$3"
+    local deployment="$4"
+    local kubernetes="$5"
+    local description
+
+    # We only care about major.minor version numbers here.
+    if [ "$kubernetes" != "master" ]; then
+      kubernetes="$(echo "${kubernetes}" | sed -e 's/\([0-9]*\)\.\([0-9]*\).*/\1\.\2/')"
+    fi
+
+    echo "annotations:"
+    case "$type" in
+        ci)
+            echo "${indent}testgrid-dashboards: sig-storage-csi-ci"
+            local alpha_testgrid_prefix="$(if [ "$tests" = "alpha" ]; then echo alpha-; fi)"
+            echo "${indent}testgrid-tab-name: ${alpha_testgrid_prefix}${deployment}-on-${kubernetes}"
+            echo "${indent}testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com"
+            description="periodic Kubernetes-CSI job"
+            ;;
+        pull)
+            local testgrid
+            local name=$(test_name "$tests" "$deployment" "$kubernetes" | sed -e 's/^-//')
+            if [ "$name" ]; then
+                testgrid="sig-storage-csi-$repo"
+            else
+                testgrid="sig-storage-csi-other"
+                name=$(job_name "$@")
+            fi
+            echo "${indent}testgrid-dashboards: $testgrid"
+            echo "${indent}testgrid-tab-name: $name"
+            description="Kubernetes-CSI pull job"
+            ;;
+    esac
+
+    if [ "$repo" ]; then
+        description+=" in repo $repo"
+    fi
+    if [ "$tests" ]; then
+        description+=" for $tests tests"
+    fi
+    if [ "$deployment" ] || [ "$kubernetes" ]; then
+        description+=", using deployment $deployment on Kubernetes $kubernetes"
+    fi
+    echo "${indent}description: $description"
+}
+
+# Common suffix for job names which contains informatiopn about the test and cluster.
+# Empty or starts with a hyphen.
+test_name() {
+    local tests="$1"
+    local deployment="$2"
+    local kubernetes="$3"
+    local name
+
+    if [ "$tests" ] && [ "$tests" != "non-alpha" ]; then
         name+="-$tests"
     fi
     if [ "$deployment" ] || [ "$kubernetes" ]; then
@@ -201,6 +273,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    $(annotations "      " "pull" "$repo" "$tests" "$deployment" "$kubernetes")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -214,7 +287,7 @@ EOF
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "$kubernetes"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -248,6 +321,7 @@ EOF
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    $(annotations "      " "pull" "$repo" "$tests" "$deployment" master)
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -281,6 +355,7 @@ EOF
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    $(annotations "      " "pull" "$repo" "unit")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -319,10 +394,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: $(job_name "pull" "$repo" "$tests")
-      description: Kubernetes-CSI pull $tests job in $repo
+    $(annotations "      " "pull" "$repo" "$tests")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -332,8 +404,6 @@ EOF
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "${latest_stable_k8s_version}"
         - name: CSI_PROW_TESTS
           value: "$(expand_tests "$tests")"
         # docker-in-docker needs privileged mode
@@ -364,10 +434,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-$repo
-      description: Kubernetes-CSI pull job on $repo
+    $(annotations "      " "pull" "$repo")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -416,7 +483,6 @@ for tests in non-alpha alpha; do
                 fi
             fi
             actual="$(if [ "$kubernetes" = "master" ]; then echo latest; else echo "release-$kubernetes"; fi)"
-            alpha_testgrid_prefix="$(if [ "$tests" = "alpha" ]; then echo alpha-; fi)"
             cat >>"$base/csi-driver-host-path/csi-driver-host-path-config.yaml" <<EOF
 - interval: 6h
   name: $(job_name "ci" "" "$tests" "$deployment" "$kubernetes")
@@ -430,11 +496,7 @@ for tests in non-alpha alpha; do
     preset-dind-enabled: "true"
     preset-bazel-remote-cache-enabled: "$(if [ "$kubernetes" = "master" ]; then echo true; else echo false; fi)"
     preset-kind-volume-mounts: "true"
-  annotations:
-    testgrid-dashboards: sig-storage-csi
-    testgrid-tab-name: ${alpha_testgrid_prefix}${deployment}-on-${kubernetes}
-    testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI ${tests} tests with Kubernetes ${kubernetes} and ${deployment} sidecars
+  $(annotations "    " "ci" "" "$tests" "$deployment" "$kubernetes")
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
@@ -466,10 +528,6 @@ done
 # release.
 for kubernetes in 1.14.0 1.15 master; do
     actual="${kubernetes/master/latest}"
-    k8s_minor="${kubernetes}"
-    if [ "$k8s_minor" != "master" ]; then
-      k8s_minor="$(echo "${k8s_minor}" | sed -e 's/\([0-9]*\)\.\([0-9]*\).*/\1\.\2/')"
-    fi
 
     for tests in non-alpha alpha; do
         # Alpha with latest sidecars only on master.
@@ -490,11 +548,7 @@ for kubernetes in 1.14.0 1.15 master; do
     preset-dind-enabled: "true"
     preset-bazel-remote-cache-enabled: "true"
     preset-kind-volume-mounts: "true"
-  annotations:
-    testgrid-dashboards: sig-storage-csi
-    testgrid-tab-name: ${alpha_testgrid_prefix}canary-on-${k8s_minor}
-    testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com
-    description: Kubernetes-CSI $tests tests with Kubernetes ${k8s_minor} and canary sidecars
+  $(annotations "    " "ci" "" "$tests" "canary" "$kubernetes")
   spec:
     containers:
     # We need this image because it has Docker in Docker and go.
diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
index 7a5b7b624e54..80c2a496ec93 100644
--- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
+++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
@@ -2,20 +2,20 @@
 
 presubmits:
   kubernetes-csi/livenessprobe:
-  - name: pull-kubernetes-csi-livenessprobe
+  - name: pull-kubernetes-csi-livenessprobe-1-14-on-kubernetes-1-14
     always_run: true
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"]
+    skip_branches: ["^(release-0.4|release-1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-livenessprobe
-      description: Kubernetes-CSI pull non-alpha job in livenessprobe
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo livenessprobe for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,8 +25,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
+          value: "1.14.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.14"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -35,20 +42,60 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-livenessprobe-unit
+  - name: pull-kubernetes-csi-livenessprobe-1-14-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo livenessprobe for non-alpha tests, using deployment 1.14 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-livenessprobe-1-15-on-kubernetes-1-15
     always_run: true
     optional: false
     decorate: true
     skip_report: false
-    skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"]
+    skip_branches: ["^(release-0.4|release-1.0)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-livenessprobe-unit
-      description: Kubernetes-CSI pull unit job in livenessprobe
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo livenessprobe for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -58,30 +105,40 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
-          value: "unit"
+          value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-livenessprobe-alpha
-    always_run: true
+  - name: pull-kubernetes-csi-livenessprobe-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
     optional: true
     decorate: true
     skip_report: false
-    skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"]
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-livenessprobe-alpha
-      description: Kubernetes-CSI pull alpha job in livenessprobe
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo livenessprobe for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -91,8 +148,52 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-livenessprobe-alpha-1-15-on-kubernetes-1-15
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    skip_branches: ["^(release-0.4|release-1.0)$"]
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo livenessprobe for alpha tests, using deployment 1.15 on Kubernetes 1.15
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
@@ -101,3 +202,78 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
+  - name: pull-kubernetes-csi-livenessprobe-alpha-1-15-on-kubernetes-master
+    # Explicitly needs to be started with /test.
+    # This cannot be enabled by default because there's always the risk
+    # that something changes in master which breaks the pre-merge check.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo livenessprobe for alpha tests, using deployment 1.15 on Kubernetes master
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "serial-alpha parallel-alpha"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-livenessprobe-unit
+    always_run: true
+    decorate: true
+    skip_report: false
+    skip_branches: ["^(release-0.4|release-1.0)$"]
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-livenessprobe
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo livenessprobe for unit tests
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_TESTS
+          value: "unit"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
diff --git a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml
index ca2a99761694..273a8afc25d5 100644
--- a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml
+++ b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml
@@ -12,6 +12,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: 1-14-on-kubernetes-1-14
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for non-alpha tests, using deployment 1.14 on Kubernetes 1.14
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,7 +29,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -51,6 +55,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: 1-14-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for non-alpha tests, using deployment 1.14 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -84,6 +92,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: 1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for non-alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -97,7 +109,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -123,6 +135,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: 1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for non-alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -156,6 +172,10 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: alpha-1-15-on-kubernetes-1-15
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for alpha tests, using deployment 1.15 on Kubernetes 1.15
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -169,7 +189,7 @@ presubmits:
         # Update only when the newer version is known to not cause issues,
         # otherwise presubmit jobs may start to fail for reasons that are
         # unrelated to the PR. Testing against the latest Kubernetes is covered
-        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -195,6 +215,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: alpha-1-15-on-kubernetes-master
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for alpha tests, using deployment 1.15 on Kubernetes master
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -228,6 +252,10 @@ presubmits:
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
+    annotations:
+      testgrid-dashboards: sig-storage-csi-node-driver-registrar
+      testgrid-tab-name: unit
+      description: Kubernetes-CSI pull job in repo node-driver-registrar for unit tests
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
diff --git a/config/testgrids/kubernetes/sig-storage/config.yaml b/config/testgrids/kubernetes/sig-storage/config.yaml
index 64960feaaf98..09c54ad569db 100644
--- a/config/testgrids/kubernetes/sig-storage/config.yaml
+++ b/config/testgrids/kubernetes/sig-storage/config.yaml
@@ -3,7 +3,15 @@ dashboard_groups:
   dashboard_names:
     - sig-storage-kubernetes
     - sig-storage-local-static-provisioner
-    - sig-storage-csi
+    - sig-storage-csi-ci
+    - sig-storage-csi-csi-driver-host-path
+    - sig-storage-csi-external-attacher
+    - sig-storage-csi-external-provisioner
+    - sig-storage-csi-external-resizer
+    - sig-storage-csi-external-snapshotter
+    - sig-storage-csi-livenessprobe
+    - sig-storage-csi-node-driver-registrar
+    - sig-storage-csi-other
 
 dashboards:
 - name: sig-storage-kubernetes
@@ -122,4 +130,12 @@ dashboards:
       base_options: include-filter-by-regex=sig-storage
       description: E2E tests against default kubernetes on GKE
 
-- name: sig-storage-csi
\ No newline at end of file
+- name: sig-storage-csi-ci
+- name: sig-storage-csi-csi-driver-host-path
+- name: sig-storage-csi-external-attacher
+- name: sig-storage-csi-external-provisioner
+- name: sig-storage-csi-external-resizer
+- name: sig-storage-csi-external-snapshotter
+- name: sig-storage-csi-livenessprobe
+- name: sig-storage-csi-node-driver-registrar
+- name: sig-storage-csi-other
diff --git a/config/tests/testgrids/config_test.go b/config/tests/testgrids/config_test.go
index cf7792fef336..fd78e9e0abd4 100644
--- a/config/tests/testgrids/config_test.go
+++ b/config/tests/testgrids/config_test.go
@@ -338,10 +338,6 @@ var noPresubmitsInTestgridPrefixes = []string{
 	"containerd/cri",
 	"GoogleCloudPlatform/k8s-multicluster-ingress",
 	"kubeflow/pipelines",
-	"kubernetes-csi/csi-driver-host-path",
-	"kubernetes-csi/external-attacher",
-	"kubernetes-csi/external-provisioner",
-	"kubernetes-csi/node-driver-registrar",
 	"kubernetes-sigs/gcp-compute-persistent-disk-csi-driver",
 	"kubernetes-sigs/gcp-filestore-csi-driver",
 	"kubernetes-sigs/kind",