diff --git a/src/tests/bundles/bionic-queens-functional.yaml b/src/tests/bundles/bionic-queens-functional.yaml
index d6e5fb2..f8b96ad 100644
--- a/src/tests/bundles/bionic-queens-functional.yaml
+++ b/src/tests/bundles/bionic-queens-functional.yaml
@@ -22,8 +22,7 @@ applications:
     charm: cs:~openstack-charmers-next/bionic/neutron-api
     constraints: mem=1G
     num_units: 1
-    options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
-      ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, reverse-dns-lookup: true}
+    options: {flat-network-providers: physnet1, neutron-security-groups: true}
     series: bionic
   neutron-dynamic-routing:
     charm: ../../../neutron-dynamic-routing
diff --git a/src/tests/bundles/xenial-pike-functional.yaml b/src/tests/bundles/xenial-pike-functional.yaml
index 705fbf3..b3a0427 100644
--- a/src/tests/bundles/xenial-pike-functional.yaml
+++ b/src/tests/bundles/xenial-pike-functional.yaml
@@ -23,14 +23,12 @@ applications:
     charm: cs:~openstack-charmers-next/xenial/neutron-api
     constraints: mem=1G
     num_units: 1
-    options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
-      ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, openstack-origin: 'cloud:xenial-pike',
-      reverse-dns-lookup: true}
+    options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-pike'}
     series: xenial
   neutron-dynamic-routing:
     charm: ../../../neutron-dynamic-routing
     num_units: 1
-    options: {openstack-origin: 'cloud:xenial-pike/proposed'}
+    options: {openstack-origin: 'cloud:xenial-pike'}
     series: xenial
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
diff --git a/src/tests/bundles/xenial-queens-functional.yaml b/src/tests/bundles/xenial-queens-functional.yaml
index b32b1ba..ee491d9 100644
--- a/src/tests/bundles/xenial-queens-functional.yaml
+++ b/src/tests/bundles/xenial-queens-functional.yaml
@@ -22,14 +22,12 @@ applications:
     charm: cs:~openstack-charmers-next/xenial/neutron-api
     constraints: mem=1G
     num_units: 1
-    options: {dns-domain: mojo.serverstack., enable-ml2-dns: true, flat-network-providers: physnet1,
-      ipv4-ptr-zone-prefix-size: 24, neutron-security-groups: true, openstack-origin: 'cloud:xenial-queens',
-      reverse-dns-lookup: true}
+    options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-queens'}
     series: xenial
   neutron-dynamic-routing:
     charm: ../../../neutron-dynamic-routing
     num_units: 1
-    options: {openstack-origin: 'cloud:xenial-queens/proposed'}
+    options: {openstack-origin: 'cloud:xenial-queens'}
     series: xenial
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/xenial/rabbitmq-server