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 228ab364e5edc..46f73d5816893 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,8 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on csi-driver-flex
+      testgrid-dashboards: csi-pull-other
+      testgrid-tab-name: pull-kubernetes-csi-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 29eac2b65a835..300f3d5698af0 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
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in csi-driver-host-path
+      testgrid-dashboards: csi-pull-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.
@@ -285,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-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.
@@ -325,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-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.
@@ -365,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-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.
@@ -405,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-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.
@@ -445,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-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.
@@ -485,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-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.
@@ -525,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-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.
@@ -565,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-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.
@@ -611,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-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.
@@ -657,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-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.
@@ -703,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-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 b2fea1bec0b0a..060e523416dea 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,8 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on csi-lib-utils
+      testgrid-dashboards: csi-pull-other
+      testgrid-tab-name: pull-kubernetes-csi-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 21e12ba068144..d5b7187fa5da3 100644
--- a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
@@ -12,8 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on csi-proxy
+      testgrid-dashboards: csi-pull-other
+      testgrid-tab-name: pull-kubernetes-csi-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 4c2b1b202a4fd..5fb6eb16ecbcd 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,8 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on csi-release-tools
+      testgrid-dashboards: csi-pull-other
+      testgrid-tab-name: pull-kubernetes-csi-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 65b548f31563d..834bdf304a61f 100644
--- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
+++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
@@ -12,8 +12,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on csi-test
+      testgrid-dashboards: csi-pull-other
+      testgrid-tab-name: pull-kubernetes-csi-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 c26aa64731e0d..f5cffb8d8b263 100644
--- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
+++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in external-attacher
+      testgrid-dashboards: csi-pull-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 1d53463336520..b90acecceb842 100644
--- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
+++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in external-provisioner
+      testgrid-dashboards: csi-pull-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 900a5dd5a3f8b..9cc89d29f09f5 100644
--- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
+++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in external-resizer
+      testgrid-dashboards: csi-pull-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.
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 45d97dd04b99d..1f47984db1720 100644
--- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
+++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in external-snapshotter
+      testgrid-dashboards: csi-pull-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.
diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh
index 66769a719d967..332d048f4f883 100755
--- a/config/jobs/kubernetes-csi/gen-jobs.sh
+++ b/config/jobs/kubernetes-csi/gen-jobs.sh
@@ -131,7 +131,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-ci" and send alert emails, "pull" jobs land in "sig-storage-<repo>"
+# and don't alert. Some repos only have a single pull job. Those
+# land in "sig-storage-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-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="csi-pull-$repo"
+            else
+                testgrid="csi-pull-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
@@ -204,9 +271,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes ${kubernetes}
+    $(annotations "      " "pull" "$repo" "$tests" "$deployment" "$kubernetes")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -220,7 +285,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "$kubernetes"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -254,9 +319,7 @@ EOF
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes master
+    $(annotations "      " "pull" "$repo" "$tests" "$deployment" master)
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -290,9 +353,7 @@ EOF
       preset-dind-enabled: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in $repo
+    $(annotations "      " "pull" "$repo" "unit")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -331,9 +392,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      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.
@@ -373,9 +432,7 @@ EOF
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull job on $repo
+    $(annotations "      " "pull" "$repo")
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -424,7 +481,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")
@@ -438,11 +494,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.
@@ -474,10 +526,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.
@@ -498,11 +546,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 a92db3818d37f..2e5cd1a099663 100644
--- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
+++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in livenessprobe, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in livenessprobe, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in livenessprobe
+      testgrid-dashboards: csi-pull-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.
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 d6d88086df511..d7cf987e90b62 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
@@ -13,8 +13,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.14 on Kubernetes 1.14.0
+      testgrid-dashboards: csi-pull-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.
@@ -28,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.14.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -55,8 +56,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.14 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -91,8 +93,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -106,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -133,8 +136,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -169,8 +173,9 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes 1.15.0
+      testgrid-dashboards: csi-pull-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.
@@ -184,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-ci#Summary).
         - name: CSI_PROW_KUBERNETES_VERSION
           value: "1.15.0"
         - name: CSI_PROW_KUBERNETES_DEPLOYMENT
@@ -211,8 +216,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes master
+      testgrid-dashboards: csi-pull-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.
@@ -247,8 +253,9 @@ presubmits:
       preset-bazel-remote-cache-enabled: "true"
       preset-kind-volume-mounts: "true"
     annotations:
-      testgrid-dashboards: sig-storage-csi
-      description: Kubernetes-CSI pull unit job in node-driver-registrar
+      testgrid-dashboards: csi-pull-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 64960feaaf987..0da5113d1042c 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-ci
+    - sig-storage-csi-driver-host-path
+    - sig-storage-external-attacher
+    - sig-storage-external-provisioner
+    - sig-storage-external-resizer
+    - sig-storage-external-snapshotter
+    - sig-storage-livenessprobe
+    - sig-storage-node-driver-registrar
+    - sig-storage-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-ci
+- name: sig-storage-csi-driver-host-path
+- name: sig-storage-external-attacher
+- name: sig-storage-external-provisioner
+- name: sig-storage-external-resizer
+- name: sig-storage-external-snapshotter
+- name: sig-storage-livenessprobe
+- name: sig-storage-node-driver-registrar
+- name: sig-storage-other