diff --git a/classes/cluster/virtual-mcp11-aio-barbican/.env b/classes/cluster/virtual-mcp11-aio-barbican/.env
index d406c92..36a0420 100644
--- a/classes/cluster/virtual-mcp11-aio-barbican/.env
+++ b/classes/cluster/virtual-mcp11-aio-barbican/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables manila runtest artifactory logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables manila runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/.env b/classes/cluster/virtual-mcp11-aio-ironic/.env
index 361091f..0af10f8 100644
--- a/classes/cluster/virtual-mcp11-aio-ironic/.env
+++ b/classes/cluster/virtual-mcp11-aio-ironic/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic bind powerdns designate iptables runtest artifactory tftpd-hpa baremetal-simulator logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic bind powerdns designate iptables runtest artifactory tftpd-hpa baremetal-simulator logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio-manila/.env b/classes/cluster/virtual-mcp11-aio-manila/.env
index 9652618..8f8e9ab 100644
--- a/classes/cluster/virtual-mcp11-aio-manila/.env
+++ b/classes/cluster/virtual-mcp11-aio-manila/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables manila runtest artifactory logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables manila runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/.env b/classes/cluster/virtual-mcp11-aio-octavia/.env
index a975308..4b0114a 100644
--- a/classes/cluster/virtual-mcp11-aio-octavia/.env
+++ b/classes/cluster/virtual-mcp11-aio-octavia/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables manila runtest artifactory logrotate auditd octavia openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables manila runtest artifactory logrotate auditd octavia openscap)
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/.env b/classes/cluster/virtual-mcp11-aio-ssl/.env
index 662a299..9b00ffd 100644
--- a/classes/cluster/virtual-mcp11-aio-ssl/.env
+++ b/classes/cluster/virtual-mcp11-aio-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/.env b/classes/cluster/virtual-mcp11-aio-telemetry/.env
index 6887bb8..e646bca 100644
--- a/classes/cluster/virtual-mcp11-aio-telemetry/.env
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq redis apache keystone gnocchi glance nova neutron cinder ceilometer aodh panko heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq redis apache keystone gnocchi glance nova neutron cinder ceilometer aodh panko heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 662a299..9b00ffd 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs xtrabackup prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate iptables runtest artifactory logrotate auditd openscap)
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 6585152..1c5530e 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -46,7 +46,7 @@
     openstack_node_role: primary
     cluster_public_host: ${_param:single_address}
     cluster_public_protocol: http
-    openstack_region: RegionOne
+    openstack_region: CustomRegion
     admin_email: root@localhost
     rabbitmq_openstack_password: workshop
     galera_server_cluster_name: openstack_cluster
@@ -252,6 +252,7 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   keystone:
     server:
+      admin_region: ${_param:openstack_region}
       database:
         ssl:
           enabled: ${_param:galera_ssl_enabled}