diff --git a/classes/cluster/aaa-ha-freeipa/aaa/init.yml b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
index 8da6aee..f0afe5c 100644
--- a/classes/cluster/aaa-ha-freeipa/aaa/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
@@ -9,6 +9,7 @@
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
 - system.openssh.server.team.mmo_devops
+- system.openssh.server.team.services
 parameters:
   _param:
     salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/aaa-ha-freeipa/infra/config.yml b/classes/cluster/aaa-ha-freeipa/infra/config.yml
index bd29e36..da20586 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/config.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/config.yml
@@ -39,8 +39,10 @@
               #source: pkg
               #name: salt-formula-salt
               source: git
-              address: 'https://github.com/epcim/salt-formula-salt.git'
-              revision: 'review/petr_michalec/allow-multiple-ext-pillars-and-reclass-options'
+              address: 'https://github.com/salt-formulas/salt-formula-salt.git'
+              revision: 'master'
+              #address: 'https://github.com/epcim/salt-formula-salt.git'
+              #revision: 'review/petr_michalec/allow-multiple-ext-pillars-and-reclass-options'
 
   reclass:
     storage:
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster/aaa-ha-freeipa/infra/init.yml
index 845ae33..38ee22a 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/init.yml
@@ -7,6 +7,7 @@
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
 - system.openssh.server.team.mmo_devops
+- system.openssh.server.team.services
 - system.rsyslog.client.single
 parameters:
   _param:
diff --git a/classes/cluster/os-aio-ovs/openstack/init.yml b/classes/cluster/os-aio-ovs/openstack/init.yml
index eb5d243..b01f074 100644
--- a/classes/cluster/os-aio-ovs/openstack/init.yml
+++ b/classes/cluster/os-aio-ovs/openstack/init.yml
@@ -62,7 +62,7 @@
     glusterfs_service_host: ${_param:openstack_control_node01_address}
     aodh_service_host: ${_param:openstack_control_node01_address}
     keystone_designate_password: workshop
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -84,7 +84,6 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/init.yml b/classes/cluster/os-ha-ovs-syndic/openstack/init.yml
index 771c191..0aa3a79 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/init.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/init.yml
@@ -70,7 +70,7 @@
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -87,7 +87,6 @@
     keystone_keystone_password: workshop
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/os-ha-ovs/openstack/init.yml b/classes/cluster/os-ha-ovs/openstack/init.yml
index b2610bf..2f74ab9 100644
--- a/classes/cluster/os-ha-ovs/openstack/init.yml
+++ b/classes/cluster/os-ha-ovs/openstack/init.yml
@@ -99,7 +99,7 @@
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -118,7 +118,6 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     keystone_designate_password: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-os-ovs/openstack/init.yml b/classes/cluster/sl-os-ovs/openstack/init.yml
index 70e4733..e8ad2c3 100644
--- a/classes/cluster/sl-os-ovs/openstack/init.yml
+++ b/classes/cluster/sl-os-ovs/openstack/init.yml
@@ -70,7 +70,7 @@
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -91,7 +91,6 @@
     keystone_aodh_password: workshop
     keystone_designate_password: workshop
     keystone_ceilometer_password: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index ff63ad9..92abd7b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -80,7 +80,7 @@
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -104,7 +104,6 @@
     keystone_nova_password: workshop
     keystone_designate_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index fd60e93..8f78734 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -83,7 +83,7 @@
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -108,7 +108,6 @@
     keystone_nova_password: workshop
     keystone_designate_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index db21afe..bcf207f 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -93,7 +93,7 @@
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -117,7 +117,6 @@
     keystone_nova_password: workshop
     keystone_designate_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
index 55d9230..255c179 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
@@ -61,7 +61,7 @@
     cluster_baremetal_local_address: ${_param:cluster_local_address}
     openstack_baremetal_node01_baremetal_address: 192.168.90.11
     openstack_baremetal_node01_address: 172.16.10.110
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -85,7 +85,6 @@
     keystone_nova_password: workshop
     keystone_ironic_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 05b9094..d96f0d0 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -78,7 +78,7 @@
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
     glusterfs_service_host: ${_param:cluster_vip_address}
-    metadata_password: password
+    metadata_password: workshop
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
@@ -100,7 +100,6 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     ceilometer_secret_key: workshop
-    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
@@ -168,4 +167,4 @@
       user:
         root:
           name: root
-          password: false
\ No newline at end of file
+          password: false