diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 97e4ac9514..8a62e798b6 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2770,8 +2770,8 @@ jobs:
   - name: ^gate-tempest-dsvm-ironic-inspector-discovery-nv$
     branch: ^(?!stable/liberty).*$
 
-  # NOTE(jlvilla): Ironic Grenade does not work until after mitaka
-  - name: ^gate-grenade-dsvm-ironic
+  # NOTE(jlvilla): Ironic and Inspector Grenade do not work until after mitaka
+  - name: ^gate-grenade-dsvm-ironic.*$
     branch: ^(?!stable/(liberty|mitaka)).*$
 
   - name: gate-senlin-dsvm-tempest-functional
@@ -7045,13 +7045,13 @@ projects:
       - gate-ironic-inspector-dsvm-ipa
       - gate-ironic-inspector-dsvm-discovery
       - gate-tempest-dsvm-ironic-inspector-nv
+      - gate-grenade-dsvm-ironic-inspector-nv
     gate:
       - gate-ironic-inspector-tox-func
       - gate-ironic-inspector-dsvm-ipa
       - gate-ironic-inspector-dsvm-discovery
     experimental:
       - gate-tempest-dsvm-ironic-inspector-discovery-nv
-      - gate-grenade-dsvm-ironic-inspector-nv
 
   - name: openstack/ironic-inspector-specs
     template: