diff --git a/tests/caas/smoke.yaml.j2 b/tests/caas/smoke.yaml.j2
index 903146b1..84c863b5 100644
--- a/tests/caas/smoke.yaml.j2
+++ b/tests/caas/smoke.yaml.j2
@@ -35,7 +35,7 @@ applications:
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.12/edge
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/tests/ceph/smoke.yaml.j2 b/tests/ceph/smoke.yaml.j2
index af283aef..d9fecfc5 100644
--- a/tests/ceph/smoke.yaml.j2
+++ b/tests/ceph/smoke.yaml.j2
@@ -21,7 +21,7 @@ applications:
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.12/edge
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/tests/core/smoke.yaml.j2 b/tests/core/smoke.yaml.j2
index 96c919dd..2df3a89e 100644
--- a/tests/core/smoke.yaml.j2
+++ b/tests/core/smoke.yaml.j2
@@ -28,7 +28,7 @@ applications:
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.12/edge
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/tests/misc/smoke.yaml.j2 b/tests/misc/smoke.yaml.j2
index 50b12aee..545d1c2f 100644
--- a/tests/misc/smoke.yaml.j2
+++ b/tests/misc/smoke.yaml.j2
@@ -26,7 +26,7 @@ applications:
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.12/edge
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/tests/tempest/smoke.yaml.j2 b/tests/tempest/smoke.yaml.j2
index 312d9d64..24a1ec72 100644
--- a/tests/tempest/smoke.yaml.j2
+++ b/tests/tempest/smoke.yaml.j2
@@ -28,7 +28,7 @@ applications:
   rabbitmq:
     charm: ch:rabbitmq-k8s
     channel: 3.12/edge
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 61eee14c..f093d5be 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -372,6 +372,7 @@
       - charms/ovn-central-k8s/*
       - charms/ovn-relay-k8s/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       # Artifacts will be downloaded from below charm jobs
       charm_jobs:
@@ -418,6 +419,7 @@
       - charms/tempest-k8s/*
       - tests/local/zaza/sunbeam/charm_tests/tempest_k8s/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       # Artifacts will be downloaded from below charm jobs
       charm_jobs:
@@ -464,6 +466,7 @@
       - charms/aodh-k8s/*
       - charms/watcher-k8s/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       charm_jobs:
         - charm-build-cinder-k8s
@@ -505,6 +508,7 @@
       - charms/barbican-k8s/*
       - charms/magnum-k8s/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       charm_jobs:
         - charm-build-heat-k8s
@@ -549,6 +553,7 @@
       - charms/horizon-k8s/*
       - charms/masakari-k8s/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       charm_jobs:
         - charm-build-designate-k8s
@@ -577,6 +582,7 @@
       - charms/sunbeam-machine/*
       - charms/sunbeam-clusterd/*
       - rebuild
+      - zuul.d/zuul.yaml
     vars:
       env_type: lxd
       charm_jobs:
@@ -946,4 +952,4 @@
       - rebuild
     secrets:
       - charmhub_token
-    timeout: 3600
\ No newline at end of file
+    timeout: 3600
diff --git a/zuul.d/zuul.yaml b/zuul.d/zuul.yaml
index b5e35c38..85f11924 100644
--- a/zuul.d/zuul.yaml
+++ b/zuul.d/zuul.yaml
@@ -18,7 +18,7 @@
             nodeset: ubuntu-noble
             voting: false
     vars:
-      juju_channel: 3.5/stable
+      juju_channel: 3.6/stable
       juju_classic_mode: false
       env_type: k8s
       k8s_channel: 1.30-classic/candidate