diff --git a/development/openstack-base-bionic-ussuri-ovn/bundle.yaml b/development/openstack-base-bionic-ussuri-ovn/bundle.yaml
index 710b8b3e..faab6879 100644
--- a/development/openstack-base-bionic-ussuri-ovn/bundle.yaml
+++ b/development/openstack-base-bionic-ussuri-ovn/bundle.yaml
@@ -6,7 +6,7 @@
 #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
 #       for more information.
 ---
-local_overlay_enabled: true
+local_overlay_enabled: False
 series: bionic
 variables:
   openstack-origin:    &openstack-origin     cloud:bionic-ussuri
diff --git a/development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2 b/development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
new file mode 100644
index 00000000..5756c0e9
--- /dev/null
+++ b/development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
@@ -0,0 +1,10 @@
+machines:
+  '0':
+    series: bionic
+    constraints: tags=^virtual
+  '1':
+    series: bionic
+    constraints: tags=^virtual
+  '2':
+    series: bionic
+    constraints: tags=^virtual
diff --git a/development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
similarity index 100%
rename from development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2
rename to development/openstack-base-bionic-ussuri-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
diff --git a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml
index 72ed29c2..b080aff1 100644
--- a/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml
+++ b/development/openstack-base-eoan-train-mysql8-migration/bundle.yaml
@@ -6,7 +6,7 @@
 #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
 #       for more information.
 ---
-local_overlay_enabled: true
+local_overlay_enabled: False
 series: eoan
 variables:
   openstack-origin:    &openstack-origin     distro
diff --git a/development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/maas/bundle.yaml.j2 b/development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/maas/bundle.yaml.j2
new file mode 100644
index 00000000..39a61568
--- /dev/null
+++ b/development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/maas/bundle.yaml.j2
@@ -0,0 +1,13 @@
+machines:
+  '0':
+    series: eoan
+    constraints: tags=^virtual
+  '1':
+    series: eoan
+    constraints: tags=^virtual
+  '2':
+    series: eoan
+    constraints: tags=^virtual
+  '3':
+    series: eoan
+    constraints: tags=^virtual
diff --git a/development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/openstack/bundle.yaml.j2
similarity index 100%
rename from development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/local-charm-overlay.yaml.j2
rename to development/openstack-base-eoan-train-mysql8-migration/tests/bundles/overlays/openstack/bundle.yaml.j2
diff --git a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml
index 148d7166..611690e0 100644
--- a/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml
+++ b/development/openstack-base-eoan-train-mysql8-ovn/bundle.yaml
@@ -6,7 +6,7 @@
 #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
 #       for more information.
 ---
-local_overlay_enabled: true
+local_overlay_enabled: False
 series: eoan
 variables:
   openstack-origin:    &openstack-origin     distro
diff --git a/development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/maas/bundle.yaml.j2 b/development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
new file mode 100644
index 00000000..0b1f478e
--- /dev/null
+++ b/development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
@@ -0,0 +1,10 @@
+machines:
+  '0':
+    series: eoan
+    constraints: tags=^virtual
+  '1':
+    series: eoan
+    constraints: tags=^virtual
+  '2':
+    series: eoan
+    constraints: tags=^virtual
diff --git a/development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
similarity index 100%
rename from development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2
rename to development/openstack-base-eoan-train-mysql8-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
diff --git a/development/openstack-base-focal-ussuri-ovn/bundle.yaml b/development/openstack-base-focal-ussuri-ovn/bundle.yaml
index c435b771..e5442953 100644
--- a/development/openstack-base-focal-ussuri-ovn/bundle.yaml
+++ b/development/openstack-base-focal-ussuri-ovn/bundle.yaml
@@ -6,7 +6,7 @@
 #       section of the [OpenStack Charms Deployment Guide](https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/)
 #       for more information.
 ---
-local_overlay_enabled: true
+local_overlay_enabled: False
 series: focal
 variables:
   openstack-origin:    &openstack-origin     distro
diff --git a/development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2 b/development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
new file mode 100644
index 00000000..00ee17f8
--- /dev/null
+++ b/development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/maas/bundle.yaml.j2
@@ -0,0 +1,10 @@
+machines:
+  '0':
+    series: focal
+    constraints: tags=^virtual
+  '1':
+    series: focal
+    constraints: tags=^virtual
+  '2':
+    series: focal
+    constraints: tags=^virtual
diff --git a/development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
similarity index 100%
rename from development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/local-charm-overlay.yaml.j2
rename to development/openstack-base-focal-ussuri-ovn/tests/bundles/overlays/openstack/bundle.yaml.j2
diff --git a/development/shared/neutron-ext-net b/development/shared/neutron-ext-net
index 6b8599d9..04d117ee 100755
--- a/development/shared/neutron-ext-net
+++ b/development/shared/neutron-ext-net
@@ -173,4 +173,4 @@ if __name__ == '__main__':
                             )
         logging.info('Router connected to %s', net_name)
     else:
-        logging.warning('Router already connect to %s', net_name)
+        logging.warning('Router already connected to %s', net_name)
diff --git a/development/shared/neutron-ext-net-ksv3 b/development/shared/neutron-ext-net-ksv3
index e77dbf2c..f9a91afc 100755
--- a/development/shared/neutron-ext-net-ksv3
+++ b/development/shared/neutron-ext-net-ksv3
@@ -158,4 +158,4 @@ if __name__ == '__main__':
                             )
         logging.info('Router connected to %s', net_name)
     else:
-        logging.warning('Router already connect to %s', net_name)
+        logging.warning('Router already connected to %s', net_name)
diff --git a/stable/shared/neutron-ext-net b/stable/shared/neutron-ext-net
index 6b8599d9..04d117ee 100755
--- a/stable/shared/neutron-ext-net
+++ b/stable/shared/neutron-ext-net
@@ -173,4 +173,4 @@ if __name__ == '__main__':
                             )
         logging.info('Router connected to %s', net_name)
     else:
-        logging.warning('Router already connect to %s', net_name)
+        logging.warning('Router already connected to %s', net_name)