diff --git a/src/tests/bundles/bionic-rocky-site-a.yaml b/src/tests/bundles/bionic-rocky-site-a.yaml
index 56721c7..de113f1 100644
--- a/src/tests/bundles/bionic-rocky-site-a.yaml
+++ b/src/tests/bundles/bionic-rocky-site-a.yaml
@@ -21,6 +21,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: cloud:bionic-rocky
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
     num_units: 0
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index caba8e0..fccde4d 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -21,6 +21,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: cloud:bionic-rocky
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
     num_units: 0
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
index aefc4fb..46b2d14 100644
--- a/src/tests/bundles/bionic-stein.yaml
+++ b/src/tests/bundles/bionic-stein.yaml
@@ -21,6 +21,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: cloud:bionic-stein
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
     num_units: 0
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index 071f9d3..834975e 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -21,6 +21,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: cloud:bionic-train
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
     num_units: 0
@@ -32,6 +33,8 @@ applications:
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
+    options:
+      openstack-origin: cloud:bionic-train
   ceph-mon:
     charm: cs:~openstack-charmers-next/ceph-mon
     num_units: 3
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index 7e1ef38..11956c5 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -21,6 +21,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: cloud:bionic-ussuri
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
     num_units: 0
@@ -32,6 +33,8 @@ applications:
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
   ceph-mon:
     charm: cs:~openstack-charmers-next/ceph-mon
     num_units: 3
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index e6ff0fe..8dd138a 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -48,6 +48,7 @@ applications:
     options:
       block-device: None
       glance-api-version: 2
+      openstack-origin: *openstack-origin
 
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph