diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index c458c2c..53ec417 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -33,7 +33,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: aodh
-        user: aodh
+        user: ${_param:mysql_aodh_username}
         password: ${_param:mysql_aodh_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -50,7 +50,7 @@
         host: ${_param:keystone_service_host}
         port: 35357
         tenant: service
-        user: aodh
+        user: ${_param:keystone_aodh_username}
         password: ${_param:keystone_aodh_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index 7b98c83..110ff29 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -8,8 +8,12 @@
     server:
       role: ${_param:openstack_node_role}
       identity:
+        user: ${_param:keystone_barbican_username}
+        password: ${_param:keystone_barbican_password}
         protocol: ${_param:cluster_internal_protocol}
       database:
+        user: ${_param:mysql_barbican_username}
+        password: ${_param:mysql_barbican_password}
         host: ${_param:openstack_database_address}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index c1ef15e..1ee95f7 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -9,6 +9,8 @@
   barbican:
     server:
       database:
+        user: ${_param:mysql_barbican_username}
+        password: ${_param:mysql_barbican_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_barbican_ssl_ca_file}
@@ -18,6 +20,8 @@
           enabled: ${_param:galera_ssl_enabled}
       role: ${_param:openstack_node_role}
       identity:
+        user: ${_param:keystone_barbican_username}
+        password: ${_param:keystone_barbican_password}
         protocol: ${_param:internal_protocol}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 6bb4e71..c24adf7 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -17,7 +17,7 @@
         host: ${_param:keystone_service_host}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 037bb4e..0bf079f 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -9,6 +9,8 @@
         ssl:
           enabled: ${_param:ceilometer_agent_ssl_enabled}
       identity:
+        user: ${_param:keystone_ceilometer_username}
+        password: ${_param:keystone_ceilometer_password}
         protocol: ${_param:internal_protocol}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 26f9a68..8f9c996 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -17,7 +17,7 @@
         host: ${_param:keystone_service_host}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 0704a2b..485eda2 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -29,7 +29,7 @@
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index c7d2686..9ee78ef 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -25,7 +25,7 @@
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: ceilometer
+        user: ${_param:keystone_ceilometer_username}
         password: ${_param:keystone_ceilometer_password}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index a81d257..f881efc 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -36,7 +36,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: cinder
-        user: cinder
+        user: ${_param:mysql_cinder_username}
         password: ${_param:mysql_cinder_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -51,7 +51,7 @@
         host: ${_param:cluster_vip_address}
         port: 35357
         tenant: service
-        user: cinder
+        user: ${_param:keystone_cinder_username}
         password: ${_param:keystone_cinder_password}
         protocol: ${_param:cluster_internal_protocol}
       service_user:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 31b391b..6ddbdd4 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -22,6 +22,8 @@
       # set 'image_conversion_dir' option in case of ceph deployment volume and controller running on the same node
       image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
       database:
+        user: ${_param:mysql_cinder_username}
+        password: ${_param:mysql_cinder_password}
         host: ${_param:single_address}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -31,6 +33,8 @@
         ssl:
           enabled: ${_param:galera_ssl_enabled}
       identity:
+        user: ${_param:keystone_cinder_username}
+        password: ${_param:keystone_cinder_password}
         protocol: ${_param:internal_protocol}
         region: ${_param:openstack_region}
       service_user:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 6478d6f..3648ad9 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -9,6 +9,8 @@
       enabled: True
       image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
       database:
+        user: ${_param:mysql_cinder_username}
+        password: ${_param:mysql_cinder_password}
         host: ${_param:single_address}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -32,6 +34,8 @@
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       identity:
+        user: ${_param:keystone_cinder_username}
+        password: ${_param:keystone_cinder_password}
         host: ${_param:single_address}
         region: ${_param:openstack_region}
       service_user:
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 74f2344..52ecaf1 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -15,6 +15,8 @@
       enabled: True
       image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
       database:
+        user: ${_param:mysql_cinder_username}
+        password: ${_param:mysql_cinder_password}
         host: ${_param:openstack_database_address}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -42,6 +44,8 @@
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       identity:
+        user: ${_param:keystone_cinder_username}
+        password: ${_param:keystone_cinder_password}
         host: ${_param:openstack_control_address}
         protocol: ${_param:cluster_internal_protocol}
         region: ${_param:openstack_region}
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 153bca8..2e6362d 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -41,6 +41,8 @@
       ignore_lockout_failure_attempts: True
       lock_password: False
     # Cinder
+    mysql_cinder_username: cinder
+    keystone_cinder_username: cinder
     cinder_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     cinder_memcache_secret_key: ''
     cinder_old_version: ${_param:openstack_old_version}
@@ -49,6 +51,8 @@
     cinder_service_user_enabled: ${_param:openstack_service_user_enabled}
     cinder_image_conversion_dir_path: /var/tmp/cinder/conversion
     # Nova
+    mysql_nova_username: nova
+    keystone_nova_username: nova
     nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     nova_memcache_secret_key: ''
     nova_old_version: ${_param:openstack_old_version}
@@ -57,6 +61,8 @@
     nova_instance_build_timeout: 3600
     nova_service_user_enabled: ${_param:openstack_service_user_enabled}
     # Glance
+    mysql_glance_username: glance
+    keystone_glance_username: glance
     glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     glance_memcache_secret_key: ''
     glance_old_version: ${_param:openstack_old_version}
@@ -65,12 +71,16 @@
     # Allow CORS from horizon, needed for direct upload
     glance_cors_allowed_origin: '${_param:horizon_public_protocol}://${_param:horizon_public_host}'
     # Heat
+    mysql_heat_username: heat
+    keystone_heat_username: heat
     heat_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     heat_memcache_secret_key: ''
     heat_old_version: ${_param:openstack_old_version}
     heat_version: ${_param:openstack_version}
     heat_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     # Aodh
+    mysql_aodh_username: aodh
+    keystone_aodh_username: aodh
     aodh_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     aodh_memcache_secret_key: ''
     aodh_old_version: ${_param:openstack_old_version}
@@ -79,13 +89,23 @@
     aodh_redis_db: ${_param:openstack_telemetry_redis_db}
     aodh_redis_sentinel_mastername: ${_param:openstack_telemetry_redis_sentinel_mastername}
     # Ceilometer
+    mysql_ceilometer_username: ceilometer
+    keystone_ceilometer_username: ceilometer
     ceilometer_old_version: ${_param:openstack_old_version}
     ceilometer_version: ${_param:openstack_version}
     ceilometer_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     ceilometer_gnocchi_archive_policy: default
     ceilometer_redis_db: ${_param:openstack_telemetry_redis_db}
     ceilometer_redis_sentinel_mastername: ${_param:openstack_telemetry_redis_sentinel_mastername}
+    # Congress
+    keystone_congress_username: congress
+    # Grafana
+    mysql_grafana_username: grafana
+    # Graphite
+    mysql_graphite_username: graphite
     # Gnocchi
+    mysql_gnocchi_username: gnocchi
+    keystone_gnocchi_username: gnocchi
     gnocchi_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     gnocchi_memcache_secret_key: ''
     gnocchi_version: 4.0
@@ -94,22 +114,32 @@
     gnocchi_redis_db: ${_param:openstack_telemetry_redis_db}
     gnocchi_redis_sentinel_mastername: ${_param:openstack_telemetry_redis_sentinel_mastername}
     # Panko
+    mysql_panko_username: panko
+    keystone_panko_username: panko
     panko_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     panko_memcache_secret_key: ''
     panko_old_version: ${_param:openstack_old_version}
     panko_version: ${_param:openstack_version}
     panko_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     # Barbican
+    mysql_barbican_username: barbican
+    keystone_barbican_username: barbican
     barbican_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     barbican_memcache_secret_key: ''
     barbican_old_version: ${_param:openstack_old_version}
     barbican_version: ${_param:openstack_version}
     barbican_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+    # Billometer
+    keystone_billometer_username: billometer
     # Designate
+    mysql_designate_username: designate
+    keystone_designate_username: designate
     designate_old_version: ${_param:openstack_old_version}
     designate_version: ${_param:openstack_version}
     designate_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     # Ironic
+    mysql_ironic_username: ironic
+    keystone_ironic_username: ironic
     ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     ironic_memcache_secret_key: ''
     ironic_console_enabled: true
@@ -117,6 +147,7 @@
     ironic_version: ${_param:openstack_version}
     ironic_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     # Keystone
+    mysql_keystone_username: keystone
     keystone_old_version: ${_param:openstack_old_version}
     keystone_version: ${_param:openstack_version}
     keystone_upgrade_enabled: ${_param:openstack_upgrade_enabled}
@@ -139,10 +170,17 @@
     keystone_fernet_rotate_rsync_minute: 0
     keystone_fernet_rotate_rsync_hour: '*'
     # Manila
+    mysql_manila_username: manila
+    keystone_manila_username: manila
     manila_old_version: ${_param:openstack_old_version}
     manila_version: ${_param:openstack_version}
     manila_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+    # Murano
+    mysql_murano_username: murano
+    keystone_murano_username: murano
     # Neutron
+    mysql_neutron_username: neutron
+    keystone_neutron_username: neutron
     neutron_old_version: ${_param:openstack_old_version}
     neutron_version: ${_param:openstack_version}
     neutron_upgrade_enabled: ${_param:openstack_upgrade_enabled}
@@ -193,12 +231,22 @@
     horizon_version: ${_param:openstack_version}
     horizon_upgrade_enabled: ${_param:openstack_upgrade_enabled}
     # Octavia
+    mysql_octavia_username: octavia
+    keystone_octavia_username: octavia
     octavia_health_manager_node01_address: 192.168.10.10
     octavia_health_manager_node02_address: 192.168.10.11
     octavia_health_manager_node03_address: 192.168.10.12
     #
     amphora_image_name: amphora-x64-haproxy
     amphora_image_url: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-${_param:openstack_version}-${_param:mcp_version}.qcow2
+    # Sahara
+    mysql_sahara_username: sahara
+    keystone_sahara_username: sahara
+    # Swift
+    keystone_swift_username: swift
+    # Tacker
+    mysql_tacker_username: tacker
+    keystone_tacker_username: tacker
     # HAproxy
     haproxy_openstack_web_bind_port: ${_param:horizon_public_port}
     #
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index a7d6bb2..cd0bc1d 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -36,7 +36,7 @@
         name:
           main_database: designate
           pool_manager: designate_pool_manager
-        user: designate
+        user: ${_param:mysql_designate_username}
         password: ${_param:mysql_designate_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -50,7 +50,7 @@
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: designate
+        user: ${_param:keystone_designate_username}
         password: ${_param:keystone_designate_password}
         protocol: ${_param:cluster_internal_protocol}
       bind:
diff --git a/designate/server/cluster/simple.yml b/designate/server/cluster/simple.yml
index ecf34c1..55998d5 100644
--- a/designate/server/cluster/simple.yml
+++ b/designate/server/cluster/simple.yml
@@ -33,7 +33,7 @@
         name:
           main_database: designate
           pool_manager: designate_pool_manager
-        user: designate
+        user: ${_param:mysql_designate_username}
         password: ${_param:mysql_designate_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -47,7 +47,7 @@
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: designate
+        user: ${_param:keystone_designate_username}
         password: ${_param:keystone_designate_password}
         protocol: ${_param:cluster_internal_protocol}
       bind:
diff --git a/designate/server/single.yml b/designate/server/single.yml
index f054b0c..8f07ffb 100644
--- a/designate/server/single.yml
+++ b/designate/server/single.yml
@@ -34,7 +34,7 @@
         name:
           main_database: designate
           pool_manager: designate_pool_manager
-        user: designate
+        user: ${_param:mysql_designate_username}
         password: ${_param:mysql_designate_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -48,7 +48,7 @@
         host: ${_param:single_address}
         port: 35357
         tenant: service
-        user: designate
+        user: ${_param:keystone_designate_username}
         password: ${_param:keystone_designate_password}
         protocol: ${_param:internal_protocol}
       message_queue:
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index ea4dfe5..4647521 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -31,8 +31,3 @@
               volumes:
                 - /srv/volumes/jenkins:/var/jenkins_home
                 - /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
-  # This is required only for deployments in swarm
-  jenkins:
-    client:
-      location:
-        url: http://jenkins_master:8080
diff --git a/docker/swarm/stack/monitoring/elasticsearch_exporter.yml b/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
index 5cbc05e..ce02782 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_exporter.yml
@@ -12,7 +12,7 @@
                 encrypted: 1
           service:
             elasticsearch_exporter:
-              command: --es-cluster ${_param:stacklight_log_address}:9200 --nodes-stats-disable --cluster-health-disable --indices-stats-disable
+              command: --es-cluster ${_param:fluentd_elasticsearch_scheme}://${_param:stacklight_log_address}:9200 --nodes-stats-disable --cluster-health-disable --indices-stats-disable
               networks:
                 - monitoring
               deploy:
@@ -26,3 +26,4 @@
               image: ${_param:docker_image_prometheus_es_exporter}
               volumes:
                 - "${prometheus:elasticsearch_exporter:dir:config}/elasticsearch_exporter.cfg:/usr/src/app/exporter.cfg"
+                - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
diff --git a/galera/server/database/aodh.yml b/galera/server/database/aodh.yml
index c7cdfdc..d71a0ef 100644
--- a/galera/server/database/aodh.yml
+++ b/galera/server/database/aodh.yml
@@ -7,12 +7,12 @@
         aodh:
           encoding: utf8
           users:
-          - name: aodh
+          - name: ${_param:mysql_aodh_username}
             password: ${_param:mysql_aodh_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_aodh_ssl_option}
-          - name: aodh
+          - name: ${_param:mysql_aodh_username}
             password: ${_param:mysql_aodh_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/barbican.yml b/galera/server/database/barbican.yml
index a292660..21bd732 100644
--- a/galera/server/database/barbican.yml
+++ b/galera/server/database/barbican.yml
@@ -7,12 +7,12 @@
         barbican:
           encoding: utf8
           users:
-          - name: barbican
+          - name: ${_param:mysql_barbican_username}
             password: ${_param:mysql_barbican_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_barbican_ssl_option}
-          - name: barbican
+          - name: ${_param:mysql_barbican_username}
             password: ${_param:mysql_barbican_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/ceilometer.yml b/galera/server/database/ceilometer.yml
index 08a7f8b..586aae3 100644
--- a/galera/server/database/ceilometer.yml
+++ b/galera/server/database/ceilometer.yml
@@ -7,12 +7,12 @@
         ceilometer:
           encoding: utf8
           users:
-          - name: ceilometer
+          - name: ${_param:mysql_ceilometer_username}
             password: ${_param:mysql_ceilometer_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_ceilometer_ssl_option}
-          - name: ceilometer
+          - name: ${_param:mysql_ceilometer_username}
             password: ${_param:mysql_ceilometer_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/cinder.yml b/galera/server/database/cinder.yml
index 6478cb8..f1ae9a3 100644
--- a/galera/server/database/cinder.yml
+++ b/galera/server/database/cinder.yml
@@ -7,12 +7,12 @@
         cinder:
           encoding: utf8
           users:
-          - name: cinder
+          - name: ${_param:mysql_cinder_username}
             password: ${_param:mysql_cinder_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_cinder_ssl_option}
-          - name: cinder
+          - name: ${_param:mysql_cinder_username}
             password: ${_param:mysql_cinder_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/designate.yml b/galera/server/database/designate.yml
index 43a76f9..fef27ab 100644
--- a/galera/server/database/designate.yml
+++ b/galera/server/database/designate.yml
@@ -7,12 +7,12 @@
         designate:
           encoding: utf8
           users:
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_designate_ssl_option}
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: ${_param:cluster_vip_address}
             rights: all
@@ -20,12 +20,12 @@
         designate_pool_manager:
           encoding: utf8
           users:
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_designate_ssl_option}
-          - name: designate
+          - name: ${_param:mysql_designate_username}
             password: ${_param:mysql_designate_password}
             host: ${_param:cluster_vip_address}
             rights: all
diff --git a/galera/server/database/glance.yml b/galera/server/database/glance.yml
index 7af81d8..0ca9f6b 100644
--- a/galera/server/database/glance.yml
+++ b/galera/server/database/glance.yml
@@ -7,12 +7,12 @@
         glance:
           encoding: utf8
           users:
-          - name: glance
+          - name: ${_param:mysql_glance_username}
             password: ${_param:mysql_glance_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_glance_ssl_option}
-          - name: glance
+          - name: ${_param:mysql_glance_username}
             password: ${_param:mysql_glance_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/gnocchi.yml b/galera/server/database/gnocchi.yml
index 1ee36da..71c468e 100644
--- a/galera/server/database/gnocchi.yml
+++ b/galera/server/database/gnocchi.yml
@@ -7,12 +7,12 @@
         gnocchi:
           encoding: utf8
           users:
-          - name: gnocchi
+          - name: ${_param:mysql_gnocchi_username}
             password: ${_param:mysql_gnocchi_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_gnocchi_ssl_option}
-          - name: gnocchi
+          - name: ${_param:mysql_gnocchi_username}
             password: ${_param:mysql_gnocchi_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/grafana.yml b/galera/server/database/grafana.yml
index 3bfee87..3afb436 100644
--- a/galera/server/database/grafana.yml
+++ b/galera/server/database/grafana.yml
@@ -7,12 +7,12 @@
         grafana:
           encoding: utf8
           users:
-          - name: grafana
+          - name: ${_param:mysql_grafana_username}
             password: ${_param:mysql_grafana_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_grafana_ssl_option}
-          - name: grafana
+          - name: ${_param:mysql_grafana_username}
             password: ${_param:mysql_grafana_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/graphite.yml b/galera/server/database/graphite.yml
index 595c16b..fb0582c 100644
--- a/galera/server/database/graphite.yml
+++ b/galera/server/database/graphite.yml
@@ -7,7 +7,7 @@
         graphite:
           encoding: 'utf8'
           users:
-          - name: 'graphite'
+          - name: '${_param:mysql_graphite_username}'
             password: '${_param:mysql_graphite_password}'
             host: '%'
             rights: 'all'
diff --git a/galera/server/database/heat.yml b/galera/server/database/heat.yml
index 31b3968..a17db4b 100644
--- a/galera/server/database/heat.yml
+++ b/galera/server/database/heat.yml
@@ -7,12 +7,12 @@
         heat:
           encoding: utf8
           users:
-          - name: heat
+          - name: ${_param:mysql_heat_username}
             password: ${_param:mysql_heat_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_heat_ssl_option}
-          - name: heat
+          - name: ${_param:mysql_heat_username}
             password: ${_param:mysql_heat_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/ironic.yml b/galera/server/database/ironic.yml
index a478aeb..10ea447 100644
--- a/galera/server/database/ironic.yml
+++ b/galera/server/database/ironic.yml
@@ -7,12 +7,12 @@
         ironic:
           encoding: utf8
           users:
-          - name: ironic
+          - name: ${_param:mysql_ironic_username}
             password: ${_param:mysql_ironic_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_ironic_ssl_option}
-          - name: ironic
+          - name: ${_param:mysql_ironic_username}
             password: ${_param:mysql_ironic_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/keystone.yml b/galera/server/database/keystone.yml
index d6483cd..2dc90ff 100644
--- a/galera/server/database/keystone.yml
+++ b/galera/server/database/keystone.yml
@@ -7,12 +7,12 @@
         keystone:
           encoding: utf8
           users:
-          - name: keystone
+          - name: ${_param:mysql_keystone_username}
             password: ${_param:mysql_keystone_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_keystone_ssl_option}
-          - name: keystone
+          - name: ${_param:mysql_keystone_username}
             password: ${_param:mysql_keystone_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/manila.yml b/galera/server/database/manila.yml
index d233ce9..dc6c415 100644
--- a/galera/server/database/manila.yml
+++ b/galera/server/database/manila.yml
@@ -7,12 +7,12 @@
         manila:
           encoding: utf8
           users:
-          - name: manila
+          - name: ${_param:mysql_manila_username}
             password: ${_param:mysql_manila_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_manila_ssl_option}
-          - name: manila
+          - name: ${_param:mysql_manila_username}
             password: ${_param:mysql_manila_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/neutron.yml b/galera/server/database/neutron.yml
index b5ee606..772a57d 100644
--- a/galera/server/database/neutron.yml
+++ b/galera/server/database/neutron.yml
@@ -7,12 +7,12 @@
         neutron:
           encoding: 'utf8'
           users:
-          - name: 'neutron'
+          - name: '${_param:mysql_neutron_username}'
             password: '${_param:mysql_neutron_password}'
             host: '%'
             rights: 'all'
             ssl_option: ${_param:mysql_neutron_ssl_option}
-          - name: 'neutron'
+          - name: '${_param:mysql_neutron_username}'
             password: '${_param:mysql_neutron_password}'
             host: '${_param:cluster_local_address}'
             rights: 'all'
diff --git a/galera/server/database/nova.yml b/galera/server/database/nova.yml
index d2ffc4a..44bfc95 100644
--- a/galera/server/database/nova.yml
+++ b/galera/server/database/nova.yml
@@ -7,12 +7,12 @@
         nova:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
@@ -20,12 +20,12 @@
         nova_api:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
@@ -33,12 +33,12 @@
         nova_cell0:
           encoding: utf8
           users:
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_nova_ssl_option}
-          - name: nova
+          - name: ${_param:mysql_nova_username}
             password: ${_param:mysql_nova_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/octavia.yml b/galera/server/database/octavia.yml
index 7b4eaaf..893a738 100644
--- a/galera/server/database/octavia.yml
+++ b/galera/server/database/octavia.yml
@@ -7,12 +7,12 @@
         octavia:
           encoding: 'utf8'
           users:
-          - name: 'octavia'
+          - name: '${_param:mysql_octavia_username}'
             password: '${_param:mysql_octavia_password}'
             host: '%'
             rights: 'all'
             ssl_option: ${_param:mysql_octavia_ssl_option}
-          - name: 'octavia'
+          - name: '${_param:mysql_octavia_username}'
             password: '${_param:mysql_octavia_password}'
             host: '${_param:cluster_local_address}'
             rights: 'all'
diff --git a/galera/server/database/panko.yml b/galera/server/database/panko.yml
index c4c455a..3e00e5a 100644
--- a/galera/server/database/panko.yml
+++ b/galera/server/database/panko.yml
@@ -7,12 +7,12 @@
         panko:
           encoding: utf8
           users:
-          - name: panko
+          - name: ${_param:mysql_panko_username}
             password: ${_param:mysql_panko_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_panko_ssl_option}
-          - name: panko
+          - name: ${_param:mysql_panko_username}
             password: ${_param:mysql_panko_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/galera/server/database/tacker.yml b/galera/server/database/tacker.yml
index 9cd76b5..d181450 100644
--- a/galera/server/database/tacker.yml
+++ b/galera/server/database/tacker.yml
@@ -7,12 +7,12 @@
         tacker:
           encoding: utf8
           users:
-          - name: tacker
+          - name: ${_param:mysql_tacker_username}
             password: ${_param:mysql_tacker_password}
             host: '%'
             rights: all
             ssl_option: ${_param:mysql_tacker_ssl_option}
-          - name: tacker
+          - name: ${_param:mysql_tacker_username}
             password: ${_param:mysql_tacker_password}
             host: ${_param:cluster_local_address}
             rights: all
diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index 3eb7866..763ad09 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -28,7 +28,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: glance
-        user: glance
+        user: ${_param:mysql_glance_username}
         password: ${_param:mysql_glance_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -50,7 +50,7 @@
         engine: keystone
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: glance
+        user: ${_param:keystone_glance_username}
         password: ${_param:keystone_glance_password}
         region: ${_param:openstack_region}
         tenant: service
diff --git a/gnocchi/common/cluster.yml b/gnocchi/common/cluster.yml
index b00ffa5..e1c58da 100644
--- a/gnocchi/common/cluster.yml
+++ b/gnocchi/common/cluster.yml
@@ -6,6 +6,8 @@
   gnocchi:
     common:
       database:
+        user: ${_param:mysql_gnocchi_username}
+        password: ${_param:mysql_gnocchi_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_gnocchi_ssl_ca_file}
diff --git a/gnocchi/common/single.yml b/gnocchi/common/single.yml
index 834db2f..614e85e 100644
--- a/gnocchi/common/single.yml
+++ b/gnocchi/common/single.yml
@@ -6,6 +6,8 @@
   gnocchi:
     common:
       database:
+        user: ${_param:mysql_gnocchi_username}
+        password: ${_param:mysql_gnocchi_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_gnocchi_ssl_ca_file}
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index 1ad5e44..8e3265e 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -17,6 +17,8 @@
         metric_processing_delay: 15
         metric_reporting_delay: 30
       identity:
+        user: ${_param:keystone_gnocchi_username}
+        password: ${_param:keystone_gnocchi_password}
         host: ${_param:openstack_control_address}
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/gnocchi/server/single.yml b/gnocchi/server/single.yml
index 43a2c9d..cf6ebfa 100644
--- a/gnocchi/server/single.yml
+++ b/gnocchi/server/single.yml
@@ -5,6 +5,8 @@
     server:
       role: ${_param:openstack_node_role}
       identity:
+        user: ${_param:keystone_gnocchi_username}
+        password: ${_param:keystone_gnocchi_password}
         region: ${_param:openstack_region}
         protocol: ${_param:internal_protocol}
       metricd:
diff --git a/grafana/server/single.yml b/grafana/server/single.yml
index 6303430..c7aa8a9 100644
--- a/grafana/server/single.yml
+++ b/grafana/server/single.yml
@@ -15,7 +15,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: grafana
-        user: grafana
+        user: ${_param:mysql_grafana_username}
         password: ${_param:mysql_grafana_password}
       auth:
         basic:
diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index be2f211..89a5885 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -34,7 +34,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: heat
-        user: heat
+        user: ${_param:mysql_heat_username}
         password: ${_param:mysql_heat_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -60,7 +60,7 @@
         host: ${_param:cluster_vip_address}
         port: 35357
         tenant: service
-        user: heat
+        user: ${_param:keystone_heat_username}
         password: ${_param:keystone_heat_password}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
diff --git a/ironic/conductor/storage/cinder.yml b/ironic/conductor/storage/cinder.yml
index 33af09a..22dc687 100644
--- a/ironic/conductor/storage/cinder.yml
+++ b/ironic/conductor/storage/cinder.yml
@@ -11,5 +11,5 @@
         project_domain_id: default
         project_name: service
         user_domain_name: Default
-        username: cinder
+        username: ${_param:keystone_cinder_username}
         region: ${_param:openstack_region}
diff --git a/keystone/client/os_client_config/octavia_identity.yml b/keystone/client/os_client_config/octavia_identity.yml
index 3d84b0c..8dabc3f 100644
--- a/keystone/client/os_client_config/octavia_identity.yml
+++ b/keystone/client/os_client_config/octavia_identity.yml
@@ -12,7 +12,7 @@
                   identity_api_version: '3'
                   interface: 'internal'
                   auth:
-                    username: 'octavia'
+                    username: '${_param:keystone_octavia_username}'
                     password: ${_param:keystone_octavia_password}
                     user_domain_name: 'Default'
                     project_name: 'service'
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index c5ca83f..321cf0e 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -39,7 +39,7 @@
                 admin_path: '/'
         octavia_identity:
           admin:
-            user: octavia
+            user: ${_param:keystone_octavia_username}
             password: ${_param:keystone_octavia_password}
             project: service
             host: ${_param:keystone_service_host}
diff --git a/keystone/client/v3/service/aodh.yml b/keystone/client/v3/service/aodh.yml
index a4f217c..af9b9b2 100644
--- a/keystone/client/v3/service/aodh.yml
+++ b/keystone/client/v3/service/aodh.yml
@@ -9,6 +9,7 @@
           cloud_name: 'admin_identity'
           users:
             aodh:
+              name: ${_param:keystone_aodh_username}
               password: ${_param:keystone_aodh_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/barbican.yml b/keystone/client/v3/service/barbican.yml
index f008abc..9708bdc 100644
--- a/keystone/client/v3/service/barbican.yml
+++ b/keystone/client/v3/service/barbican.yml
@@ -14,6 +14,7 @@
               enabled: true
           users:
             barbican:
+              name: ${_param:keystone_barbican_username}
               password: ${_param:keystone_barbican_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/billometer.yml b/keystone/client/v3/service/billometer.yml
index 9e115eb..6ab12ed 100644
--- a/keystone/client/v3/service/billometer.yml
+++ b/keystone/client/v3/service/billometer.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             billometer:
+              name: ${_param:keystone_billometer_username}
               password: ${_param:keystone_billometer_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/ceilometer.yml b/keystone/client/v3/service/ceilometer.yml
index 85af602..3cdb748 100644
--- a/keystone/client/v3/service/ceilometer.yml
+++ b/keystone/client/v3/service/ceilometer.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             ceilometer:
+              name: ${_param:keystone_ceilometer_username}
               password: ${_param:keystone_ceilometer_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder.yml b/keystone/client/v3/service/cinder.yml
index 1dd279a..b94b713 100644
--- a/keystone/client/v3/service/cinder.yml
+++ b/keystone/client/v3/service/cinder.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder2.yml b/keystone/client/v3/service/cinder2.yml
index 4d49d2b..e392a6a 100644
--- a/keystone/client/v3/service/cinder2.yml
+++ b/keystone/client/v3/service/cinder2.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/cinder3.yml b/keystone/client/v3/service/cinder3.yml
index a4465ac..1ded99a 100644
--- a/keystone/client/v3/service/cinder3.yml
+++ b/keystone/client/v3/service/cinder3.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             cinder:
+              name: ${_param:keystone_cinder_username}
               password: ${_param:keystone_cinder_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/congress.yml b/keystone/client/v3/service/congress.yml
index 0d34181..936f71c 100644
--- a/keystone/client/v3/service/congress.yml
+++ b/keystone/client/v3/service/congress.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             congress:
+              name: ${_param:keystone_congress_username}
               password: ${_param:keystone_congress_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/designate.yml b/keystone/client/v3/service/designate.yml
index 271ea22..544a172 100644
--- a/keystone/client/v3/service/designate.yml
+++ b/keystone/client/v3/service/designate.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             designate:
+              name: ${_param:keystone_designate_username}
               password: ${_param:keystone_designate_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/glance.yml b/keystone/client/v3/service/glance.yml
index 0e01709..3abc3c8 100644
--- a/keystone/client/v3/service/glance.yml
+++ b/keystone/client/v3/service/glance.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             glance:
+              name: ${_param:keystone_glance_username}
               password: ${_param:keystone_glance_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/gnocchi.yml b/keystone/client/v3/service/gnocchi.yml
index 63241db..da3dfa7 100644
--- a/keystone/client/v3/service/gnocchi.yml
+++ b/keystone/client/v3/service/gnocchi.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             gnocchi:
+              name: ${_param:keystone_gnocchi_username}
               password: ${_param:keystone_gnocchi_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
index 54c8f0b..2163292 100644
--- a/keystone/client/v3/service/heat.yml
+++ b/keystone/client/v3/service/heat.yml
@@ -14,6 +14,7 @@
               enabled: true
           users:
             heat:
+              name: ${_param:keystone_heat_username}
               password: ${_param:keystone_heat_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/ironic.yml b/keystone/client/v3/service/ironic.yml
index bd2795b..5dc431e 100644
--- a/keystone/client/v3/service/ironic.yml
+++ b/keystone/client/v3/service/ironic.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             ironic:
+              name: ${_param:keystone_ironic_username}
               password: ${_param:keystone_ironic_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/manila.yml b/keystone/client/v3/service/manila.yml
index bb90159..6519b84 100644
--- a/keystone/client/v3/service/manila.yml
+++ b/keystone/client/v3/service/manila.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             manila:
+              name: ${_param:keystone_manila_username}
               password: ${_param:keystone_manila_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/manila2.yml b/keystone/client/v3/service/manila2.yml
index f5771ad..1ccf704 100644
--- a/keystone/client/v3/service/manila2.yml
+++ b/keystone/client/v3/service/manila2.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             manila:
+              name: ${_param:keystone_manila_username}
               password: ${_param:keystone_manila_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/neutron.yml b/keystone/client/v3/service/neutron.yml
index 6af16f9..1d6dae8 100644
--- a/keystone/client/v3/service/neutron.yml
+++ b/keystone/client/v3/service/neutron.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             neutron:
+              name: ${_param:keystone_neutron_username}
               password: ${_param:keystone_neutron_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/nova.yml b/keystone/client/v3/service/nova.yml
index d0c7366..2015900 100644
--- a/keystone/client/v3/service/nova.yml
+++ b/keystone/client/v3/service/nova.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             nova:
+              name: ${_param:keystone_nova_username}
               password: ${_param:keystone_nova_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/nova21.yml b/keystone/client/v3/service/nova21.yml
index 85bd29f..6ed684b 100644
--- a/keystone/client/v3/service/nova21.yml
+++ b/keystone/client/v3/service/nova21.yml
@@ -7,6 +7,7 @@
         v3:
           users:
             nova:
+              name: ${_param:keystone_nova_username}
               password: ${_param:keystone_nova_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index 54c8bc9..035dbfb 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -24,6 +24,7 @@
               enabled: true
           users:
             octavia:
+              name: ${_param:keystone_octavia_username}
               password: ${_param:keystone_octavia_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/panko.yml b/keystone/client/v3/service/panko.yml
index 226f601..1620d91 100644
--- a/keystone/client/v3/service/panko.yml
+++ b/keystone/client/v3/service/panko.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             panko:
+              name: ${_param:keystone_panko_username}
               password: ${_param:keystone_panko_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/radosgw-s3.yml b/keystone/client/v3/service/radosgw-s3.yml
index 1a7ae3c..0da4b0b 100644
--- a/keystone/client/v3/service/radosgw-s3.yml
+++ b/keystone/client/v3/service/radosgw-s3.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             swift:
+              name: ${_param:keystone_swift_username}
               password: ${_param:keystone_swift_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 2e78bb9..cf1290d 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -12,6 +12,7 @@
               enabled: true
           users:
             swift:
+              name: ${_param:keystone_swift_username}
               password: ${_param:keystone_swift_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/client/v3/service/tacker.yml b/keystone/client/v3/service/tacker.yml
index bddca05..4d4396e 100644
--- a/keystone/client/v3/service/tacker.yml
+++ b/keystone/client/v3/service/tacker.yml
@@ -8,6 +8,7 @@
         v3:
           users:
             tacker:
+              name: ${_param:keystone_tacker_username}
               password: ${_param:keystone_tacker_password}
               email: ${_param:admin_email}
               options: ${_param:openstack_service_user_options}
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 824c6b5..fe75629 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -46,7 +46,7 @@
         host: ${_param:openstack_database_address}
         name: keystone
         password: ${_param:mysql_keystone_password}
-        user: keystone
+        user: ${_param:mysql_keystone_username}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_keystone_ssl_ca_file}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index 014a6dc..8c5e594 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -43,7 +43,7 @@
         host: ${_param:single_address}
         name: keystone
         password: ${_param:mysql_keystone_password}
-        user: keystone
+        user: ${_param:mysql_keystone_username}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_keystone_ssl_ca_file}
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 57ced1d..73c679b 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -28,7 +28,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: manila
-        user: manila
+        user: ${_param:mysql_manila_username}
         password: ${_param:mysql_manila_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -42,7 +42,7 @@
         region: ${_param:openstack_region}
         host: ${_param:manila_cluster_vip_address}
         port: 35357
-        user: manila
+        user: ${_param:keystone_manila_username}
         password: ${_param:keystone_manila_password}
         tenant: service
         auth_type: password
diff --git a/manila/common/single.yml b/manila/common/single.yml
index 00f42eb..fe59263 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -26,7 +26,7 @@
         host: ${_param:single_address}
         port: 3306
         name: manila
-        user: manila
+        user: ${_param:mysql_manila_username}
         password: ${_param:mysql_manila_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -40,7 +40,7 @@
         region: ${_param:openstack_region}
         host: ${_param:single_address}
         port: 35357
-        user: manila
+        user: ${_param:keystone_manila_username}
         password: ${_param:keystone_manila_password}
         tenant: service
         auth_type: password
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index a9b1f6d..73dcb38 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -19,14 +19,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: murano
-        user: murano
+        user: ${_param:mysql_murano_username}
         password: ${_param:mysql_murano_password}
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: murano
+        user: ${_param:keystone_murano_username}
         password: ${_param:keystone_murano_password}
       message_queue:
         engine: rabbitmq
diff --git a/murano/server/single.yml b/murano/server/single.yml
index 8c85019..1512893 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -17,14 +17,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: murano
-        user: murano
+        user: ${_param:mysql_murano_username}
         password: ${_param:mysql_murano_password}
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: murano
+        user: ${_param:keystone_murano_username}
         password: ${_param:keystone_murano_password}
       message_queue:
         engine: rabbitmq
diff --git a/mysql/client/database/aodh.yml b/mysql/client/database/aodh.yml
index 92a2b29..b8842e9 100644
--- a/mysql/client/database/aodh.yml
+++ b/mysql/client/database/aodh.yml
@@ -7,11 +7,11 @@
             aodh:
               encoding: utf8
               users:
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: '%'
                 rights: all
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: ${_param:single_address}
                 rights: all
\ No newline at end of file
diff --git a/mysql/client/database/barbican.yml b/mysql/client/database/barbican.yml
index f9fe6dd..a900905 100644
--- a/mysql/client/database/barbican.yml
+++ b/mysql/client/database/barbican.yml
@@ -7,11 +7,11 @@
             barbican:
               encoding: utf8
               users:
-              - name: barbican
+              - name: ${_param:mysql_barbican_username}
                 password: ${_param:mysql_barbican_password}
                 host: '%'
                 rights: all
-              - name: barbican
+              - name: ${_param:mysql_barbican_username}
                 password: ${_param:mysql_barbican_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/ceilometer.yml b/mysql/client/database/ceilometer.yml
index 436bf97..4cf65a1 100644
--- a/mysql/client/database/ceilometer.yml
+++ b/mysql/client/database/ceilometer.yml
@@ -7,11 +7,11 @@
             ceilometer:
               encoding: utf8
               users:
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: '%'
                 rights: all
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/cinder.yml b/mysql/client/database/cinder.yml
index 4d6783b..280b35b 100644
--- a/mysql/client/database/cinder.yml
+++ b/mysql/client/database/cinder.yml
@@ -7,11 +7,11 @@
             cinder:
               encoding: utf8
               users:
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: '%'
                 rights: all
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/designate.yml b/mysql/client/database/designate.yml
index cee6ff1..f6301a8 100644
--- a/mysql/client/database/designate.yml
+++ b/mysql/client/database/designate.yml
@@ -7,11 +7,11 @@
             designate:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
\ No newline at end of file
diff --git a/mysql/client/database/designate_pool_manager.yml b/mysql/client/database/designate_pool_manager.yml
index 6913bd4..09352b4 100644
--- a/mysql/client/database/designate_pool_manager.yml
+++ b/mysql/client/database/designate_pool_manager.yml
@@ -7,11 +7,11 @@
             designate_pool_manager:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/glance.yml b/mysql/client/database/glance.yml
index b93b343..6a8a4d1 100644
--- a/mysql/client/database/glance.yml
+++ b/mysql/client/database/glance.yml
@@ -7,11 +7,11 @@
             glance:
               encoding: utf8
               users:
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: '%'
                 rights: all
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/grafana.yml b/mysql/client/database/grafana.yml
index a2899f0..26bc3cd 100644
--- a/mysql/client/database/grafana.yml
+++ b/mysql/client/database/grafana.yml
@@ -7,11 +7,11 @@
             grafana:
               encoding: utf8
               users:
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: '%'
                 rights: all
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/heat.yml b/mysql/client/database/heat.yml
index 51aae8f..36cfdc5 100644
--- a/mysql/client/database/heat.yml
+++ b/mysql/client/database/heat.yml
@@ -7,11 +7,11 @@
             heat:
               encoding: utf8
               users:
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: '%'
                 rights: all
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/ironic.yml b/mysql/client/database/ironic.yml
index e142e64..9441f74 100644
--- a/mysql/client/database/ironic.yml
+++ b/mysql/client/database/ironic.yml
@@ -7,11 +7,11 @@
             ironic:
               encoding: utf8
               users:
-              - name: ironic
+              - name: ${_param:mysql_ironic_username}
                 password: ${_param:mysql_ironic_password}
                 host: '%'
                 rights: all
-              - name: ironic
+              - name: ${_param:mysql_ironic_username}
                 password: ${_param:mysql_ironic_password}
                 host: ${_param:cluster_local_address}
                 rights: all
diff --git a/mysql/client/database/keystone.yml b/mysql/client/database/keystone.yml
index 09885dd..ebd4810 100644
--- a/mysql/client/database/keystone.yml
+++ b/mysql/client/database/keystone.yml
@@ -7,11 +7,11 @@
             keystone:
               encoding: utf8
               users:
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: '%'
                 rights: all
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/murano.yml b/mysql/client/database/murano.yml
index 561ea3d..5a8b41e 100644
--- a/mysql/client/database/murano.yml
+++ b/mysql/client/database/murano.yml
@@ -7,11 +7,11 @@
             murano:
               encoding: utf8
               users:
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: '%'
                 rights: all
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: ${_param:single_address}
                 rights: all
\ No newline at end of file
diff --git a/mysql/client/database/neutron.yml b/mysql/client/database/neutron.yml
index 94d9722..7481797 100644
--- a/mysql/client/database/neutron.yml
+++ b/mysql/client/database/neutron.yml
@@ -7,11 +7,11 @@
             neutron:
               encoding: utf8
               users:
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: '%'
                 rights: all
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/nova.yml b/mysql/client/database/nova.yml
index 930b280..da2a4ae 100644
--- a/mysql/client/database/nova.yml
+++ b/mysql/client/database/nova.yml
@@ -7,11 +7,11 @@
             nova:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/nova_api.yml b/mysql/client/database/nova_api.yml
index a8fbd59..96862ad 100644
--- a/mysql/client/database/nova_api.yml
+++ b/mysql/client/database/nova_api.yml
@@ -7,22 +7,22 @@
             nova_api:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
             nova_cell0:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/octavia.yml b/mysql/client/database/octavia.yml
index 6c31ece..22fa442 100644
--- a/mysql/client/database/octavia.yml
+++ b/mysql/client/database/octavia.yml
@@ -7,11 +7,11 @@
             octavia:
               encoding: utf8
               users:
-              - name: octavia
+              - name: ${_param:mysql_octavia_username}
                 password: ${_param:mysql_octavia_password}
                 host: '%'
                 rights: all
-              - name: octavia
+              - name: ${_param:mysql_octavia_username}
                 password: ${_param:mysql_octavia_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/panko.yml b/mysql/client/database/panko.yml
index e0463ef..848e32f 100644
--- a/mysql/client/database/panko.yml
+++ b/mysql/client/database/panko.yml
@@ -7,11 +7,11 @@
             panko:
               encoding: utf8
               users:
-              - name: panko
+              - name: ${_param:mysql_panko_username}
                 password: ${_param:mysql_panko_password}
                 host: '%'
                 rights: all
-              - name: panko
+              - name: ${_param:mysql_panko_username}
                 password: ${_param:mysql_panko_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database/sahara.yml b/mysql/client/database/sahara.yml
index 86497d8..3db7e3e 100644
--- a/mysql/client/database/sahara.yml
+++ b/mysql/client/database/sahara.yml
@@ -7,11 +7,11 @@
             sahara:
               encoding: utf8
               users:
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: '%'
                 rights: all
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/aodh.yml b/mysql/client/database_upgrade/aodh.yml
index d363161..e351db3 100644
--- a/mysql/client/database_upgrade/aodh.yml
+++ b/mysql/client/database_upgrade/aodh.yml
@@ -7,11 +7,11 @@
             aodh_upgrade:
               encoding: utf8
               users:
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: '%'
                 rights: all
-              - name: aodh
+              - name: ${_param:mysql_aodh_username}
                 password: ${_param:mysql_aodh_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/ceilometer.yml b/mysql/client/database_upgrade/ceilometer.yml
index 5344b4b..28f6a26 100644
--- a/mysql/client/database_upgrade/ceilometer.yml
+++ b/mysql/client/database_upgrade/ceilometer.yml
@@ -7,11 +7,11 @@
             ceilometer_upgrade:
               encoding: utf8
               users:
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: '%'
                 rights: all
-              - name: ceilometer
+              - name: ${_param:mysql_ceilometer_username}
                 password: ${_param:mysql_ceilometer_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/cinder.yml b/mysql/client/database_upgrade/cinder.yml
index bafc70d..a72823e 100644
--- a/mysql/client/database_upgrade/cinder.yml
+++ b/mysql/client/database_upgrade/cinder.yml
@@ -7,11 +7,11 @@
             cinder_upgrade:
               encoding: utf8
               users:
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: '%'
                 rights: all
-              - name: cinder
+              - name: ${_param:mysql_cinder_username}
                 password: ${_param:mysql_cinder_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/designate.yml b/mysql/client/database_upgrade/designate.yml
index 48b7fce..7f13286 100644
--- a/mysql/client/database_upgrade/designate.yml
+++ b/mysql/client/database_upgrade/designate.yml
@@ -7,11 +7,11 @@
             designate_upgrade:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/designate_pool_manager.yml b/mysql/client/database_upgrade/designate_pool_manager.yml
index 26dd975..abc9491 100644
--- a/mysql/client/database_upgrade/designate_pool_manager.yml
+++ b/mysql/client/database_upgrade/designate_pool_manager.yml
@@ -7,11 +7,11 @@
             designate_pool_manager_upgrade:
               encoding: utf8
               users:
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: '%'
                 rights: all
-              - name: designate
+              - name: ${_param:mysql_designate_username}
                 password: ${_param:mysql_designate_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/glance.yml b/mysql/client/database_upgrade/glance.yml
index bebe604..d1690ae 100644
--- a/mysql/client/database_upgrade/glance.yml
+++ b/mysql/client/database_upgrade/glance.yml
@@ -7,11 +7,11 @@
             glance_upgrade:
               encoding: utf8
               users:
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: '%'
                 rights: all
-              - name: glance
+              - name: ${_param:mysql_glance_username}
                 password: ${_param:mysql_glance_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/grafana.yml b/mysql/client/database_upgrade/grafana.yml
index 7759a66..30c9d35 100644
--- a/mysql/client/database_upgrade/grafana.yml
+++ b/mysql/client/database_upgrade/grafana.yml
@@ -7,11 +7,11 @@
             grafana_upgrade:
               encoding: utf8
               users:
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: '%'
                 rights: all
-              - name: grafana
+              - name: ${_param:mysql_grafana_username}
                 password: ${_param:mysql_grafana_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/heat.yml b/mysql/client/database_upgrade/heat.yml
index 24e4cb1..1dd29cd 100644
--- a/mysql/client/database_upgrade/heat.yml
+++ b/mysql/client/database_upgrade/heat.yml
@@ -7,11 +7,11 @@
             heat_upgrade:
               encoding: utf8
               users:
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: '%'
                 rights: all
-              - name: heat
+              - name: ${_param:mysql_heat_username}
                 password: ${_param:mysql_heat_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/keystone.yml b/mysql/client/database_upgrade/keystone.yml
index 8265662..c9b884f 100644
--- a/mysql/client/database_upgrade/keystone.yml
+++ b/mysql/client/database_upgrade/keystone.yml
@@ -7,11 +7,11 @@
             keystone_upgrade:
               encoding: utf8
               users:
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: '%'
                 rights: all
-              - name: keystone
+              - name: ${_param:mysql_keystone_username}
                 password: ${_param:mysql_keystone_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/murano.yml b/mysql/client/database_upgrade/murano.yml
index 2223ce6..45342a8 100644
--- a/mysql/client/database_upgrade/murano.yml
+++ b/mysql/client/database_upgrade/murano.yml
@@ -7,11 +7,11 @@
             murano_upgrade:
               encoding: utf8
               users:
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: '%'
                 rights: all
-              - name: murano
+              - name: ${_param:mysql_murano_username}
                 password: ${_param:mysql_murano_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/neutron.yml b/mysql/client/database_upgrade/neutron.yml
index 7dd723c..ee5e200 100644
--- a/mysql/client/database_upgrade/neutron.yml
+++ b/mysql/client/database_upgrade/neutron.yml
@@ -7,11 +7,11 @@
             neutron_upgrade:
               encoding: utf8
               users:
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: '%'
                 rights: all
-              - name: neutron
+              - name: ${_param:mysql_neutron_username}
                 password: ${_param:mysql_neutron_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/nova.yml b/mysql/client/database_upgrade/nova.yml
index 699c9c3..2a0e246 100644
--- a/mysql/client/database_upgrade/nova.yml
+++ b/mysql/client/database_upgrade/nova.yml
@@ -7,11 +7,11 @@
             nova_upgrade:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/nova_api.yml b/mysql/client/database_upgrade/nova_api.yml
index 8bb33c8..d9815d5 100644
--- a/mysql/client/database_upgrade/nova_api.yml
+++ b/mysql/client/database_upgrade/nova_api.yml
@@ -7,11 +7,11 @@
             nova_upgrade_api:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
@@ -23,11 +23,11 @@
             nova_upgrade_cell0:
               encoding: utf8
               users:
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: '%'
                 rights: all
-              - name: nova
+              - name: ${_param:mysql_nova_username}
                 password: ${_param:mysql_nova_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/mysql/client/database_upgrade/sahara.yml b/mysql/client/database_upgrade/sahara.yml
index 73618d0..414b3dc 100644
--- a/mysql/client/database_upgrade/sahara.yml
+++ b/mysql/client/database_upgrade/sahara.yml
@@ -7,11 +7,11 @@
             sahara_upgrade:
               encoding: utf8
               users:
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: '%'
                 rights: all
-              - name: sahara
+              - name: ${_param:mysql_sahara_username}
                 password: ${_param:mysql_sahara_password}
                 host: ${_param:single_address}
                 rights: all
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 91b410b..fe6f464 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -15,6 +15,9 @@
           version: latest
   neutron:
     server:
+      compute:
+        user: ${_param:keystone_nova_username}
+        password: ${_param:keystone_nova_password}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         members:
@@ -29,6 +32,8 @@
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
+        user: ${_param:mysql_neutron_username}
+        password: ${_param:mysql_neutron_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_neutron_ssl_ca_file}
@@ -38,4 +43,6 @@
           enabled: ${_param:galera_ssl_enabled}
       role: ${_param:openstack_node_role}
       identity:
+        user: ${_param:keystone_neutron_username}
+        password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index 5305fc9..77b276c 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -29,8 +29,12 @@
       compute:
         region: ${_param:openstack_region}
       database:
+        user: ${_param:mysql_neutron_username}
+        password: ${_param:mysql_neutron_password}
         host: ${_param:openstack_database_address}
       identity:
+        user: ${_param:keystone_neutron_username}
+        password: ${_param:keystone_neutron_password}
         region: ${_param:openstack_region}
       message_queue:
         members:
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 803f12f..bc025eb 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -16,6 +16,8 @@
     server:
       role: ${_param:openstack_node_role}
       database:
+        user: ${_param:mysql_neutron_username}
+        password: ${_param:mysql_neutron_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_neutron_ssl_ca_file}
@@ -33,4 +35,6 @@
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       identity:
+        user: ${_param:keystone_neutron_username}
+        password: ${_param:keystone_neutron_password}
         protocol: ${_param:internal_protocol}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index ba9132c..94e4157 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -32,14 +32,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -74,7 +74,7 @@
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 2e65d06..287442e 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -31,13 +31,13 @@
         host: ${_param:control_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         host: ${_param:control_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index bed113f..b921306 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -18,14 +18,14 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -46,7 +46,7 @@
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
@@ -56,7 +56,7 @@
         region: ${_param:openstack_region}
         host: ${_param:ironic_service_host}
         port: 6385
-        user: ironic
+        user: ${_param:keystone_ironic_username}
         tenant: service
         password: ${_param:keystone_ironic_password}
         auth_type: password
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index 6534e43..15c8190 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -18,14 +18,14 @@
         host: ${_param:control_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
       identity:
         engine: keystone
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -43,7 +43,7 @@
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 9696
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         tenant: service
         password: ${_param:keystone_neutron_password}
         protocol: ${_param:cluster_internal_protocol}
@@ -53,7 +53,7 @@
         region: ${_param:openstack_region}
         host: ${_param:control_address}
         port: 6385
-        user: ironic
+        user: ${_param:keystone_ironic_username}
         tenant: service
         password: ${_param:keystone_ironic_password}
         protocol: ${_param:cluster_internal_protocol}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 2527b33..e7f76fa 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -44,7 +44,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: nova
-        user: nova
+        user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -58,7 +58,7 @@
         region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
-        user: nova
+        user: ${_param:keystone_nova_username}
         password: ${_param:keystone_nova_password}
         tenant: service
         protocol: ${_param:cluster_internal_protocol}
@@ -96,7 +96,7 @@
         engine: neutron
         region: ${_param:openstack_region}
         host: ${_param:neutron_service_host}
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         port: 9696
         mtu: 1500
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index 72dda61..c6b1aca 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -28,7 +28,7 @@
       network:
         engine: keystone
         host: ${_param:control_address}
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         tenant: service
   neutron:
@@ -38,7 +38,7 @@
         engine: keystone
         host: ${_param:control_address}
         port: 35357
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         tenant: service
 
diff --git a/openssh/server/team/members/bworonicz.yml b/openssh/server/team/members/bworonicz.yml
new file mode 100644
index 0000000..9ac8558
--- /dev/null
+++ b/openssh/server/team/members/bworonicz.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        bworonicz:
+          email: bworonicz@mirantis.com
+          enabled: true
+          full_name: Bartosz Woronicz
+          home: /home/bworonicz
+          name: bworonicz
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        bworonicz:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOP4Yc94ZpEHY9DtYddYvWm7vEGRkYFDgSm/EWh/5SHt5BFo00oQY5IYwY3DZnDZ2Wl+tqdR+PjNNQAO6GCj9fc+/k3keD/lhbNyaqpfdlX35fvu6wOIJiDuENOyCYz4YG5mBQPsDnMREBzO7sf6/T5hElGo3eXIvHkWgXJ2Iap+c/K2hsq5RP/XqiG1MpJVKn7rt2jvMsD1cYLBf8MIQS5mbkrAFb+27h8dW5RAmSOQHDhO6Tu7Wppgrf8rDgf1EvSsXHTRMHTqpm0O0GUY8rhOkNoZgdOaQGMQWURdTEkjtj5MWKT9R2Pk8/acpdfZK/EyD6rzJ5dl/pz9D+VxCB
+          user: ${linux:system:user:bworonicz}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 955cbe9..5f3ed85 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -27,6 +27,7 @@
 - system.openssh.server.team.members.lmendes
 - system.openssh.server.team.members.kalmog
 - system.openssh.server.team.members.vstruk
+- system.openssh.server.team.members.bworonicz
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/panko/server/cluster.yml b/panko/server/cluster.yml
index b6e87bb..3257a99 100644
--- a/panko/server/cluster.yml
+++ b/panko/server/cluster.yml
@@ -24,9 +24,13 @@
       role: ${_param:openstack_node_role}
       event_time_to_live: ${_param:panko_event_time_to_live}
       identity:
+        user: ${_param:keystone_panko_username}
+        password: ${_param:keystone_panko_password}
         host: ${_param:openstack_control_address}
         protocol: ${_param:cluster_internal_protocol}
       database:
+        user: ${_param:mysql_panko_username}
+        password: ${_param:mysql_panko_password}
         host: ${_param:openstack_database_address}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
diff --git a/panko/server/single.yml b/panko/server/single.yml
index ea8f4a1..a10562a 100644
--- a/panko/server/single.yml
+++ b/panko/server/single.yml
@@ -16,8 +16,12 @@
   panko:
     server:
       identity:
+        user: ${_param:keystone_panko_username}
+        password: ${_param:keystone_panko_password}
         protocol: ${_param:internal_protocol}
       database:
+        user: ${_param:mysql_panko_username}
+        password: ${_param:mysql_panko_password}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_panko_ssl_ca_file}
diff --git a/sahara/server/cluster.yml b/sahara/server/cluster.yml
index b01ab3d..3e48e7d 100644
--- a/sahara/server/cluster.yml
+++ b/sahara/server/cluster.yml
@@ -18,7 +18,7 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: sahara
-        user: sahara
+        user: ${_param:mysql_sahara_username}
         password: ${_param:mysql_sahara_password}
       identity:
         engine: keystone
@@ -26,7 +26,7 @@
         host:  ${_param:openstack_control_address}
         port: 35357
         tenant: service
-        user: sahara
+        user: ${_param:keystone_sahara_username}
         password: ${_param:keystone_sahara_password}
       message_queue:
         engine: rabbitmq
diff --git a/sahara/server/single.yml b/sahara/server/single.yml
index fcb26c9..3b63c44 100644
--- a/sahara/server/single.yml
+++ b/sahara/server/single.yml
@@ -14,13 +14,13 @@
         host: ${_param:openstack_database_address}
         port: 3306
         name: sahara
-        user: sahara
+        user: ${_param:mysql_sahara_username}
         password: ${_param:mysql_sahara_password}
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
         port: 35357
-        user: sahara
+        user: ${_param:keystone_sahara_username}
         password: ${_param:keystone_sahara_password}
         tenant: service
       message_queue:
diff --git a/salt/control/cluster/infra_proxy_cluster.yml b/salt/control/cluster/infra_proxy_cluster.yml
index 6d4b25b..7d0454d 100644
--- a/salt/control/cluster/infra_proxy_cluster.yml
+++ b/salt/control/cluster/infra_proxy_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
+    infra_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_infra_proxy:
       user_data:
         write_files:
@@ -25,14 +25,14 @@
             prx01:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
             prx02:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
diff --git a/salt/control/cluster/infra_proxy_single.yml b/salt/control/cluster/infra_proxy_single.yml
index fe6c710..c9110f8 100644
--- a/salt/control/cluster/infra_proxy_single.yml
+++ b/salt/control/cluster/infra_proxy_single.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
+    infra_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_infra_proxy:
       user_data:
         write_files:
@@ -25,7 +25,7 @@
             prx01:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
diff --git a/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
index 4652ce2..f3de786 100644
--- a/salt/control/cluster/opencontrail_analytics_cluster.yml
+++ b/salt/control/cluster/opencontrail_analytics_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    opencontrail_analytics_backend_image: ${_param:salt_control_trusty_image_backend}
+    opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_opencontrail_analytics:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             nal01:
               name: ${_param:opencontrail_analytics_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
             nal02:
               name: ${_param:opencontrail_analytics_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
             nal03:
               name: ${_param:opencontrail_analytics_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
diff --git a/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
index 2f73d1f..2189738 100644
--- a/salt/control/cluster/opencontrail_control_cluster.yml
+++ b/salt/control/cluster/opencontrail_control_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    opencontrail_control_backend_image: ${_param:salt_control_trusty_image_backend}
+    opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_opencontrail_control:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             ntw01:
               name: ${_param:opencontrail_control_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
             ntw02:
               name: ${_param:opencontrail_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
             ntw03:
               name: ${_param:opencontrail_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index 814f65a..3d2bacd 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_benchmark_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_benchmark_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_benchmark:
       user_data:
         write_files:
@@ -25,7 +25,7 @@
             bmk01:
               name: ${_param:openstack_benchmark_node01_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_benchmark_backend_image}
               size: openstack.benchmark
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_benchmark}
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
index 9853725..ae724e9 100644
--- a/salt/control/cluster/openstack_billing_single.yml
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_billing_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_billing_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_billing:
       user_data:
         write_files:
@@ -24,7 +24,7 @@
           node:
             bil01:
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_billing_backend_image}
               size: openstack.billing
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_billing}
diff --git a/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
index 367041a..8ed8a5e 100644
--- a/salt/control/cluster/openstack_control_cluster.yml
+++ b/salt/control/cluster/openstack_control_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_control_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_control:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             ctl01:
               name: ${_param:openstack_control_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
             ctl02:
               name: ${_param:openstack_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
             ctl03:
               name: ${_param:openstack_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
diff --git a/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
index cee9ff8..56ecd2f 100644
--- a/salt/control/cluster/openstack_database_cluster.yml
+++ b/salt/control/cluster/openstack_database_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_database_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_database:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             dbs01:
               name: ${_param:openstack_database_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             dbs02:
               name: ${_param:openstack_database_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             dbs03:
               name: ${_param:openstack_database_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
diff --git a/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
index 7a59a52..cccc408 100644
--- a/salt/control/cluster/openstack_message_queue_cluster.yml
+++ b/salt/control/cluster/openstack_message_queue_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_message_queue_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_message_queue:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             msg01:
               name: ${_param:openstack_message_queue_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
             msg02:
               name: ${_param:openstack_message_queue_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
             msg03:
               name: ${_param:openstack_message_queue_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
diff --git a/salt/control/cluster/openstack_proxy_cluster.yml b/salt/control/cluster/openstack_proxy_cluster.yml
index 1f3f134..4027e00 100644
--- a/salt/control/cluster/openstack_proxy_cluster.yml
+++ b/salt/control/cluster/openstack_proxy_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_proxy:
       user_data:
         write_files:
@@ -25,14 +25,14 @@
             prx01:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
             prx02:
               name: ${_param:openstack_proxy_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
diff --git a/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
index 11771b0..386d024 100644
--- a/salt/control/cluster/openstack_proxy_single.yml
+++ b/salt/control/cluster/openstack_proxy_single.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_proxy:
       user_data:
         write_files:
@@ -25,7 +25,7 @@
             prx01:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index 594d671..d53bb45 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    openstack_telemetry_backend_image: ${_param:salt_control_trusty_image_backend}
+    openstack_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
     salt_control_cluster_node_cloud_init_openstack_telemetry:
       user_data:
         write_files:
@@ -25,21 +25,21 @@
             mdb01:
               name: ${_param:openstack_telemetry_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
             mdb02:
               name: ${_param:openstack_telemetry_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
             mdb03:
               name: ${_param:openstack_telemetry_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}