diff --git a/.zuul.yaml b/.zuul.yaml
index 2f093a23..4fbc90f1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,16 @@
       jobs:
         - grenade
         - grenade-multinode
-        - grenade-heat-multinode
-        - octavia-grenade
+        - grenade-heat-multinode:
+            required-projects:
+              - name: opendev.org/openstack/heat-tempest-plugin
+                override-checkout: 2023.1-last
+            voting: false
+        - octavia-grenade:
+            required-projects:
+              - name: opendev.org/openstack/octavia-tempest-plugin
+                override-checkout: 2023.1-last
+            voting: false
         - ironic-grenade:
             voting: false
         - grenade-skip-level:
@@ -15,8 +23,14 @@
       jobs:
         - grenade
         - grenade-multinode
-        - grenade-heat-multinode
-        - octavia-grenade
+        # - grenade-heat-multinode:
+        #     required-projects:
+        #       - name: opendev.org/openstack/heat-tempest-plugin
+        #         override-checkout: 2023.1-last
+        # - octavia-grenade:
+        #     required-projects:
+        #       - name: opendev.org/openstack/octavia-tempest-plugin
+        #         override-checkout: 2023.1-last
     experimental:
       jobs:
         - grenade-forward
diff --git a/roles/configure-grenade-branches/defaults/main.yaml b/roles/configure-grenade-branches/defaults/main.yaml
index 1a8371f7..087c0803 100644
--- a/roles/configure-grenade-branches/defaults/main.yaml
+++ b/roles/configure-grenade-branches/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-grenade_from_branch: stable/zed
-grenade_to_branch: stable/2023.1
+grenade_from_branch: unmaintained/zed
+grenade_to_branch: unmaintained/2023.1