diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml
index 8677eee..76c08a8 100644
--- a/tests/bundles/jammy-antelope.yaml
+++ b/tests/bundles/jammy-antelope.yaml
@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-antelope
 
 series: jammy
 
@@ -41,8 +41,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -126,8 +124,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/jammy-yoga-ec.yaml b/tests/bundles/jammy-yoga-ec.yaml
index 0cf89d7..b24cecf 100644
--- a/tests/bundles/jammy-yoga-ec.yaml
+++ b/tests/bundles/jammy-yoga-ec.yaml
@@ -44,8 +44,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -140,8 +138,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml
index 8677eee..87d4b5a 100644
--- a/tests/bundles/jammy-yoga.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@@ -41,8 +41,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -126,8 +124,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/jammy-zed-ec.yaml b/tests/bundles/jammy-zed-ec.yaml
index 0cf89d7..d449fde 100644
--- a/tests/bundles/jammy-zed-ec.yaml
+++ b/tests/bundles/jammy-zed-ec.yaml
@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
 series: jammy
 
@@ -44,8 +44,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -140,8 +138,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-zed.yaml
index 041dc19..94e65f8 100644
--- a/tests/bundles/jammy-zed.yaml
+++ b/tests/bundles/jammy-zed.yaml
@@ -41,8 +41,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -126,8 +124,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/kinetic-zed-ec.yaml b/tests/bundles/kinetic-zed-ec.yaml
index 479b391..42b0d69 100644
--- a/tests/bundles/kinetic-zed-ec.yaml
+++ b/tests/bundles/kinetic-zed-ec.yaml
@@ -44,8 +44,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -140,8 +138,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml
index ca1731c..4d03114 100644
--- a/tests/bundles/kinetic-zed.yaml
+++ b/tests/bundles/kinetic-zed.yaml
@@ -41,8 +41,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -126,8 +124,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/lunar-antelope-ec.yaml b/tests/bundles/lunar-antelope-ec.yaml
index f4fd5f4..9b5f7f8 100644
--- a/tests/bundles/lunar-antelope-ec.yaml
+++ b/tests/bundles/lunar-antelope-ec.yaml
@@ -44,8 +44,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -140,8 +138,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge
diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/lunar-antelope.yaml
index bf65396..a7b7de2 100644
--- a/tests/bundles/lunar-antelope.yaml
+++ b/tests/bundles/lunar-antelope.yaml
@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:lunar-antelope
+  openstack-origin: &openstack-origin distro
 
 series: lunar
 
@@ -41,8 +41,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -126,8 +124,6 @@ applications:
     charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1024
-    options:
-      source: *openstack-origin
     to:
       - '13'
     channel: latest/edge