diff --git a/bundles/openstack/bundle-config.cephlocal.yaml b/bundles/openstack/bundle-config.cephlocal.yaml
index 359425badb74a0e90d62a082c132d2a0f6f6f52c..cce0da097f7b0fb75d9712aeac5b661cadbdf480 100644
--- a/bundles/openstack/bundle-config.cephlocal.yaml
+++ b/bundles/openstack/bundle-config.cephlocal.yaml
@@ -210,7 +210,7 @@ services:
       compute-peer: *network_space_os_mgmt
       neutron-plugin: *network_space_os_mgmt
     options:
-      os-internal-network: &os_internal_network
+      os-internal-network: *os_internal_network
       nagios_context: *nagios_context
 
   nova-cloud-controller:
diff --git a/bundles/openstack/bundle-config.yaml b/bundles/openstack/bundle-config.yaml
index d24d13984ae8ea04224a60f3f2e948fc7e0550c8..df94c21a64495619c45e61f006932a2c69712eb5 100644
--- a/bundles/openstack/bundle-config.yaml
+++ b/bundles/openstack/bundle-config.yaml
@@ -211,7 +211,7 @@ services:
       compute-peer: *network_space_os_mgmt
       neutron-plugin: *network_space_os_mgmt
     options:
-      os-internal-network: &os_internal_network
+      os-internal-network: *os_internal_network
       nagios_context: *nagios_context
 
   nova-cloud-controller:
diff --git a/bundles/openstack/bundle.allinone.yaml b/bundles/openstack/bundle.allinone.yaml
index 60fb0997e9b4e95c96abb536e451dc25fa5f5964..65c3141a90744177f2b2da621194853855e768d8 100644
--- a/bundles/openstack/bundle.allinone.yaml
+++ b/bundles/openstack/bundle.allinone.yaml
@@ -494,7 +494,7 @@ services:
       compute-peer: *network_space_os_mgmt
       neutron-plugin: *network_space_os_mgmt
     options:
-      os-internal-network: &os_internal_network
+      os-internal-network: *os_internal_network
       nagios_context: *nagios_context
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
@@ -646,7 +646,7 @@ services:
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
       block-device: None
-      glance-api-version: 3
+      glance-api-version: 2
       nagios_servicegroups: ceph,block,storage
       region: *region
       use-syslog: True
diff --git a/bundles/openstack/bundle.cephlocal.allinone.yaml b/bundles/openstack/bundle.cephlocal.allinone.yaml
index 127592cabd0c4fa467ec343120883ae33926ee72..9c4c26de3829099b22853d84da25f20937a844f5 100644
--- a/bundles/openstack/bundle.cephlocal.allinone.yaml
+++ b/bundles/openstack/bundle.cephlocal.allinone.yaml
@@ -508,7 +508,7 @@ services:
       compute-peer: *network_space_os_mgmt
       neutron-plugin: *network_space_os_mgmt
     options:
-      os-internal-network: &os_internal_network
+      os-internal-network: *os_internal_network
       nagios_context: *nagios_context
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
@@ -661,7 +661,7 @@ services:
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
       block-device: None
-      glance-api-version: 3
+      glance-api-version: 2
       nagios_servicegroups: ceph,block,storage
       region: *region
       use-syslog: True
diff --git a/bundles/openstack/bundle.cephlocal.yaml b/bundles/openstack/bundle.cephlocal.yaml
index 8c6bdc352a0e38f4288d9266315282525e6a2e16..d7f871eb71053aaba16df59169ab0eab0a869faa 100644
--- a/bundles/openstack/bundle.cephlocal.yaml
+++ b/bundles/openstack/bundle.cephlocal.yaml
@@ -444,7 +444,7 @@ services:
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
       block-device: None
-      glance-api-version: 3
+      glance-api-version: 2
       nagios_servicegroups: ceph,block,storage
       region: *region
       use-syslog: True
diff --git a/bundles/openstack/bundle.yaml b/bundles/openstack/bundle.yaml
index 6c078eddfb0f27c717c6d4e718201928ebf6eb24..25ff8b7672b13db93cd051f1c389bed1a26ff646 100644
--- a/bundles/openstack/bundle.yaml
+++ b/bundles/openstack/bundle.yaml
@@ -428,7 +428,7 @@ services:
       openstack-origin: *openstack_origin
       action-managed-upgrade: True
       block-device: None
-      glance-api-version: 3
+      glance-api-version: 2
       nagios_servicegroups: ceph,block,storage
       region: *region
       use-syslog: True