diff --git a/zuul.d/devstack-tobiko-ceph.yaml b/zuul.d/devstack-tobiko-ceph.yaml
index f9d10b3..6f9f406 100644
--- a/zuul.d/devstack-tobiko-ceph.yaml
+++ b/zuul.d/devstack-tobiko-ceph.yaml
@@ -16,7 +16,7 @@
 
 - job:
     name: devstack-tobiko-ceph
-    parent: devstack-tobiko-minimal
+    parent: devstack-tobiko-storage
     required-projects:
       - openstack/devstack-plugin-ceph
     voting: false
diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index b654045..4f609aa 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -53,7 +53,6 @@
         h-api-cfn: true
         h-eng: true
         n-cpu: true
-        memory_tracker: false
         tempest: false
         tls-proxy: false
         s-account: false
diff --git a/zuul.d/devstack-tobiko-glance.yaml b/zuul.d/devstack-tobiko-storage.yaml
similarity index 64%
rename from zuul.d/devstack-tobiko-glance.yaml
rename to zuul.d/devstack-tobiko-storage.yaml
index b30e69b..8af56b8 100644
--- a/zuul.d/devstack-tobiko-glance.yaml
+++ b/zuul.d/devstack-tobiko-storage.yaml
@@ -2,20 +2,26 @@
 
 - project-template:
     name: devstack-tobiko-glance
+    description: |
+      Legacy template name for devstack-tobiko-storage jobs
+
+
+- project-template:
+    name: devstack-tobiko-storage
     description: |
       DevStack jobs intended to gate Glance project changes
     check:
       jobs:
-        - devstack-tobiko-glance
+        - devstack-tobiko-storage
     periodic:
       jobs:
-        - devstack-tobiko-glance
+        - devstack-tobiko-storage
 
 
 # --- STANDALONE -------------------------------------------------------------
 
 - job:
-    name: devstack-tobiko-glance
+    name: devstack-tobiko-storage
     parent: devstack-tobiko-minimal
     required-projects:
       - openstack/glance
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 939f418..8b92013 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,10 +7,10 @@
       - devstack-tobiko-centos
       - devstack-tobiko-ceph
       - devstack-tobiko-fedora
-      - devstack-tobiko-glance
       - devstack-tobiko-heat
       - devstack-tobiko-minimal
       - devstack-tobiko-neutron
       - devstack-tobiko-nova
       - devstack-tobiko-octavia
       - devstack-tobiko-ovs
+      - devstack-tobiko-storage