diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 312c7a6..0fc27f6 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -17,25 +17,24 @@
     # mysql:5.6.51
     docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.15"
     # jenkins:2.263.4
-    docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.15"
-    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.15"
+    docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.16"
+    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.16"
     # TODO: fix tag
-    docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.15"
+    docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.16"
     # model-generator
     docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:2019.2.6"
     docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:2019.2.6"
     # OpenContrail
     opencontrail_docker_image_tag: "2019.2.14"
     # stacklight
-    docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta-web:2019.2.14"
-    # docker-dev-local.docker.mirantis.net/openstack-docker/grafana:20210402121624
+    docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.16"
     docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:2019.2.14"
-    docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.14"
+    docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.16"
     # docker-kaas-local.artifactory.mirantis.com/stacklight/prometheus-es-exporter:v0.5.1-20210323132924
     docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.14"
     docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
-    # mirantis.azurecr.io/stacklight/sf-reporter:v0.1-20210607111404
-    docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.15"
+    # http://docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20210920100947
+    docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.16"
     docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:2019.2.6"
     docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.11"
     docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.14"
@@ -51,16 +50,16 @@
     docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
     docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
     # CVP
-    docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.15"
+    docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.16"
     docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
     docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.14"
     docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
     docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:0.11.2"
     # aptly
     docker_image_aptly:
-      base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.14"
-      public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.14"
-      publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.14"
+      base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.16"
+      public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.16"
+      publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.16"
 
     # List of images, to be placed into offline image, during separate image build process
     # WARNING: registry|target_registry and names - must be exactly same as list above!
@@ -90,23 +89,23 @@
 
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly:2019.2.14
+          name: aptly:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly-public:2019.2.14
+          name: aptly-public:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly-publisher:2019.2.14
+          name: aptly-publisher:2019.2.16
 
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: jnlp-slave:2019.2.15
+          name: jnlp-slave:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: ssh-slave:2019.2.15
+          name: ssh-slave:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: jenkins:2019.2.15
+          name: jenkins:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
           name: gerrit:2019.2.11
@@ -125,7 +124,7 @@
           name: alertmanager:2019.2.14
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: alerta-web:2019.2.14
+          name: alerta:2019.2.16
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
           name: pushgateway:2019.2.14
@@ -134,7 +133,7 @@
           name: prometheus:2019.2.14
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: sf-reporter:2019.2.15
+          name: sf-reporter:2019.2.16
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
           name: telegraf:2019.2.14
@@ -146,7 +145,7 @@
           name: prometheus-relay:2019.2.11
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: grafana:2019.2.14
+          name: grafana:2019.2.16
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
           name: heka:2019.2.6
@@ -186,7 +185,7 @@
           name: cvp-shaker:2019.2.14
         - registry: ${_param:mcp_docker_registry}/mirantis/cvp
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
-          name: cvp-sanity-checks:2019.2.15
+          name: cvp-sanity-checks:2019.2.16
         - registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
           name: xrally-openstack:0.11.2
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 8f5ac47..f367a83 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -54,6 +54,8 @@
     cinder_image_conversion_dir_path: /var/tmp/cinder/conversion
     # Nova
     mysql_nova_username: nova
+    mysql_nova_port: 3307
+    nova_control_update_cells: True
     keystone_nova_username: nova
     nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     nova_memcache_secret_key: ''
@@ -178,6 +180,7 @@
     keystone_murano_username: murano
     # Neutron
     mysql_neutron_username: neutron
+    mysql_neutron_port: 3308
     keystone_neutron_username: neutron
     neutron_old_version: ${_param:openstack_old_version}
     neutron_version: ${_param:openstack_version}
@@ -256,6 +259,8 @@
     keystone_tacker_username: tacker
     # HAproxy
     haproxy_openstack_web_bind_port: ${_param:horizon_public_port}
+    haproxy_neutron_db_proxy_enabled: True
+    haproxy_nova_db_proxy_enabled: True
     #
     # haproxy_openstack_web_sticks_params is defined for SSL by default
     # if cluster_protocolr HTTP is going to be used then haproxy_openstack_web_sticks_params
diff --git a/defaults/salt/init.yml b/defaults/salt/init.yml
index 5947dec..153d475 100644
--- a/defaults/salt/init.yml
+++ b/defaults/salt/init.yml
@@ -57,3 +57,4 @@
 
     salt_minion_ca_authority: salt_master_ca
     salt_master_api_bind_address: 0.0.0.0
+    salt_control_cluster_qemu_cpu_mode: host-passthrough
diff --git a/haproxy/proxy/listen/openstack/galera/init.yml b/haproxy/proxy/listen/openstack/galera/init.yml
index de937bc..67b79b4 100644
--- a/haproxy/proxy/listen/openstack/galera/init.yml
+++ b/haproxy/proxy/listen/openstack/galera/init.yml
@@ -1,8 +1,14 @@
+classes:
+- system.haproxy.proxy.listen.openstack.galera.mysql_nova_proxy
+- system.haproxy.proxy.listen.openstack.galera.mysql_neutron_proxy
 parameters:
   _param:
     haproxy_params_check: 'check port 9200'
   haproxy:
     proxy:
+      global:
+        maxconn: 99999
+      maxconn: 99999
       timeout:
         server: 28810s
         client: 28810s
diff --git a/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml b/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml
new file mode 100644
index 0000000..82b6d50
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml
@@ -0,0 +1,31 @@
+parameters:
+  _param:
+    haproxy_params_check: 'check port 9200'
+  haproxy:
+    proxy:
+      listen:
+        mysql_cluster_neutron_conn:
+          enabled: ${_param:haproxy_neutron_db_proxy_enabled}
+          type: mysql
+          service_name: mysql
+          balance: first
+          binds:
+          - address: ${_param:cluster_vip_address}
+            port: ${_param:mysql_neutron_port}
+          servers:
+          - name: ${_param:cluster_node03_hostname}
+            host: ${_param:cluster_node03_address}
+            port: 3306
+            params: ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          - name: ${_param:cluster_node01_hostname}
+            host: ${_param:cluster_node01_address}
+            port: 3306
+            params: backup ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          - name: ${_param:cluster_node02_hostname}
+            host: ${_param:cluster_node02_address}
+            port: 3306
+            params: backup ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          health-check:
+            mysql:
+              enabled: False
+
diff --git a/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml b/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml
new file mode 100644
index 0000000..7aa7505
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml
@@ -0,0 +1,31 @@
+parameters:
+  _param:
+    haproxy_params_check: 'check port 9200'
+  haproxy:
+    proxy:
+      listen:
+        mysql_cluster_nova_conn:
+          enabled: ${_param:haproxy_nova_db_proxy_enabled}
+          type: mysql
+          service_name: mysql
+          balance: first
+          binds:
+          - address: ${_param:cluster_vip_address}
+            port: ${_param:mysql_nova_port}
+          servers:
+          - name: ${_param:cluster_node02_hostname}
+            host: ${_param:cluster_node02_address}
+            port: 3306
+            params: ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          - name: ${_param:cluster_node01_hostname}
+            host: ${_param:cluster_node01_address}
+            port: 3306
+            params: backup ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          - name: ${_param:cluster_node03_hostname}
+            host: ${_param:cluster_node03_address}
+            port: 3306
+            params: backup ${_param:haproxy_params_check} inter 20s fastinter 2s downinter 2s rise 3 fall 3 on-marked-down shutdown-sessions
+          health-check:
+            mysql:
+              enabled: False
+
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 03406a3..38b62a2 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -13,6 +13,8 @@
     jenkins_gerrit_credentials: "gerrit"
   jenkins:
     client:
+      timestamper:
+        enabled: true
       globalenvprop:
         OFFLINE_DEPLOYMENT:
           value: ${_param:jenkins_offline_deployment}
diff --git a/jenkins/client/plugins/init.yml b/jenkins/client/plugins/init.yml
index 903aae3..e0f4f0a 100644
--- a/jenkins/client/plugins/init.yml
+++ b/jenkins/client/plugins/init.yml
@@ -40,6 +40,7 @@
         ssh-agent: {}
         test-stability: {}
         throttle-concurrents: {}
+        timestamper: {}
         workflow-cps: {}
         workflow-remote-loader: {}
         workflow-scm-step:
diff --git a/keepalived/cluster/instance/rabbitmq_vip.yml b/keepalived/cluster/instance/rabbitmq_vip.yml
index 922afc7..4cbe67c 100644
--- a/keepalived/cluster/instance/rabbitmq_vip.yml
+++ b/keepalived/cluster/instance/rabbitmq_vip.yml
@@ -8,9 +8,9 @@
       vrrp_scripts:
         rabbitemq_vip:
           content: ${_param:keepalived_rabbitemq_vrrp_script_content}
-          interval: 10
+          interval: 30
           rise: 1
-          fall: 1
+          fall: 2
       instance:
         VIP:
           track_script: rabbitemq_vip
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index c95db09..3745dac 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -36,6 +36,7 @@
       database:
         user: ${_param:mysql_neutron_username}
         password: ${_param:mysql_neutron_password}
+        port: ${_param:mysql_neutron_port}
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
           ca_file: ${_param:mysql_neutron_ssl_ca_file}
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 287987e..05f3961 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -29,7 +29,7 @@
       database:
         engine: mysql
         host: ${_param:openstack_database_address}
-        port: 3306
+        port: ${_param:mysql_nova_port}
         name: nova
         user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 87363d3..2778374 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -41,7 +41,7 @@
       database:
         engine: mysql
         host: ${_param:openstack_database_address}
-        port: 3306
+        port: ${_param:mysql_nova_port}
         name: nova
         user: ${_param:mysql_nova_username}
         password: ${_param:mysql_nova_password}
@@ -107,3 +107,4 @@
         protocol: ${_param:cluster_internal_protocol}
       metadata:
         password: ${_param:metadata_password}
+      update_cells: ${_param:nova_control_update_cells}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 10f9a1c..808b740 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -52,3 +52,4 @@
           enabled: ${_param:nova_memcache_security_enabled}
           strategy: ${_param:openstack_memcache_security_strategy}
           secret_key: ${_param:nova_memcache_secret_key}
+      update_cells: ${_param:nova_control_update_cells}
diff --git a/openssh/server/team/members/mjedynski.yml b/openssh/server/team/members/deprecated/mjedynski.yml
similarity index 100%
rename from openssh/server/team/members/mjedynski.yml
rename to openssh/server/team/members/deprecated/mjedynski.yml
diff --git a/openssh/server/team/members/pglazov.yml b/openssh/server/team/members/pglazov.yml
new file mode 100644
index 0000000..ebf7b7c
--- /dev/null
+++ b/openssh/server/team/members/pglazov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        pglazov:
+          email: pglazov@mirantis.com
+          enabled: true
+          full_name: Pavel Glazov
+          home: /home/pglazov
+          name: pglazov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        pglazov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhZxqF+NSuP+Dr2nmGHf4NIpH2xWSmq+UE/HGP6j81rKSBZeRb2SuRXLtLVh3NZ+3GLa4UQGvedcnsqzgvSt05LYujloHnLxIsrsOWbLxOcdUYkorhXenGKBxKopwViRNV2PovMAnwyZ27GkXH8RQ52XISOdTIIV7r8M3kLpxCor2jHnOzJOcr7rhLeSFTK5zw6//T3S+IOQ5/HEs+8NK1sNw2lxBTuk+dAydiaCsQqm4GMl5vZSy0j7cnsy+lq69zN2/Bi4JzKLDKF2ap4zDh/ELhUBoQhh12T0djFV9Qv9fTWI4LUW8cVyqxbfreJrZqSAyMgSRrGSUBclFTmn5Z pavel@pavel-All-Series
+          user: ${linux:system:user:pglazov}
diff --git a/openssh/server/team/members/vmarkov.yml b/openssh/server/team/members/vmarkov.yml
new file mode 100644
index 0000000..deac532
--- /dev/null
+++ b/openssh/server/team/members/vmarkov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        vmarkov:
+          email: vmarkov@mirantis.com
+          enabled: true
+          full_name: Vadym Markov
+          home: /home/vmarkov
+          name: vmarkov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        vmarkov:
+          enabled: true
+          public_keys:
+          - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBhZ34Qi4Khp2x85CL8brFdw9ZzAQ628a697oX7uHwcz vmarkov@mirantis.com
+          user: ${linux:system:user:vmarkov}
diff --git a/openssh/server/team/members/vsakharov.yml b/openssh/server/team/members/vsakharov.yml
new file mode 100644
index 0000000..630d65c
--- /dev/null
+++ b/openssh/server/team/members/vsakharov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        vsakharov:
+          email: vsakharov@mirantis.com
+          enabled: true
+          full_name: Valeriy Sakharov
+          home: /home/vsakharov
+          name: vsakharov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        vsakharov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNTShIUEl6xJY9nM44QyVc+D948G0A8WN+1GoQTldCBpzQiZXnXiyyqgfmLGtNB0bXwkvPaBPZdpq+drDT/WkAbEwnYwZQxTNi2+uqmBb05E0E5fOpw4vTtBLZKq2shpj4Z0jcAszh7LuAczSQSdqLRPPru9A/V4SXoK+aRvehVV3YBIrsyGhao+YPQoXZln1mmK/NYtltFqNr30L2KTSpMRZolAHvE8xTyiTHcXGA1hg/3RBaGdrjWLiQUA7bkP4NTF8wcIJYgg/iw38eZVa/f1z91zad7WfV5FZ/9vZI/tkzvsWjU3mxx1iDxIIimGEXapMpIk07cUTykleWsd0/ vsakharov@vsakharov
+          user: ${linux:system:user:vsakharov}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index f85f7db..17443e1 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -16,6 +16,7 @@
 - system.openssh.server.team.members.dteselkin
 - system.openssh.server.team.members.deremeev
 - system.openssh.server.team.members.mpolenchuk
+- system.openssh.server.team.members.vmarkov
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
index 931692b..700366c 100644
--- a/openssh/server/team/storage.yml
+++ b/openssh/server/team/storage.yml
@@ -1,6 +1,8 @@
 classes:
 - system.openssh.server.team.members.deprecated.akiseleva
 - system.openssh.server.team.members.deprecated.mvollman
+- system.openssh.server.team.members.deprecated.mjedynski
+- system.openssh.server.team.members.degorenko
 - system.openssh.server.team.members.mlos
-- system.openssh.server.team.members.mjedynski
+- system.openssh.server.team.members.prazumovsky
 - system.openssh.server.team.members.tjaroszyk
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
index 669dc30..e3e43e5 100644
--- a/salt/control/cluster/ceph_mon_cluster.yml
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:ceph_mon_backend_image}
               size: ceph.mon
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             cmn02:
               name: ${_param:ceph_mon_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:ceph_mon_backend_image}
               size: ceph.mon
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             cmn03:
               name: ${_param:ceph_mon_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:ceph_mon_backend_image}
               size: ceph.mon
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_mon}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/ceph_rgw_cluster.yml b/salt/control/cluster/ceph_rgw_cluster.yml
index 20dd3ed..f30ca37 100644
--- a/salt/control/cluster/ceph_rgw_cluster.yml
+++ b/salt/control/cluster/ceph_rgw_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:ceph_rgw_backend_image}
               size: ceph.rgw
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             rgw02:
               name: ${_param:ceph_rgw_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:ceph_rgw_backend_image}
               size: ceph.rgw
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             rgw03:
               name: ${_param:ceph_rgw_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:ceph_rgw_backend_image}
               size: ceph.rgw
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_ceph_rgw}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/cicd_control_cluster.yml b/salt/control/cluster/cicd_control_cluster.yml
index df061e9..c5beb20 100644
--- a/salt/control/cluster/cicd_control_cluster.yml
+++ b/salt/control/cluster/cicd_control_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:cicd_control_backend_image}
               size: cicd.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             cid02:
               name: ${_param:cicd_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:cicd_control_backend_image}
               size: cicd.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             cid03:
               name: ${_param:cicd_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:cicd_control_backend_image}
               size: cicd.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_cicd_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_idm_cluster.yml b/salt/control/cluster/infra_idm_cluster.yml
index 7e9b481..0514bc3 100644
--- a/salt/control/cluster/infra_idm_cluster.yml
+++ b/salt/control/cluster/infra_idm_cluster.yml
@@ -30,6 +30,7 @@
               backend: ${_param:infra_idm_backend_image}
               size: infra.idm
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             idm02:
               name: ${_param:infra_idm_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -37,6 +38,7 @@
               backend: ${_param:infra_idm_backend_image}
               size: infra.idm
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             idm03:
               name: ${_param:infra_idm_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -44,3 +46,4 @@
               backend: ${_param:infra_idm_backend_image}
               size: infra.idm
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_idm}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_integration_single.yml b/salt/control/cluster/infra_integration_single.yml
index 0003441..ed0f788 100644
--- a/salt/control/cluster/infra_integration_single.yml
+++ b/salt/control/cluster/infra_integration_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:infra_integration_backend_image}
               size: infra.integration
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_integration}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_maas_single.yml b/salt/control/cluster/infra_maas_single.yml
index 4654670..55b8d03 100644
--- a/salt/control/cluster/infra_maas_single.yml
+++ b/salt/control/cluster/infra_maas_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:infra_maas_backend_image}
               size: infra.maas
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_maas}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_proxy_cluster.yml b/salt/control/cluster/infra_proxy_cluster.yml
index 7d0454d..3a04117 100644
--- a/salt/control/cluster/infra_proxy_cluster.yml
+++ b/salt/control/cluster/infra_proxy_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             prx02:
               name: ${_param:openstack_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_proxy_single.yml b/salt/control/cluster/infra_proxy_single.yml
index c9110f8..39e1d0b 100644
--- a/salt/control/cluster/infra_proxy_single.yml
+++ b/salt/control/cluster/infra_proxy_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:infra_proxy_backend_image}
               size: infra.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_storage_single.yml b/salt/control/cluster/infra_storage_single.yml
index b119b26..b4f2907 100644
--- a/salt/control/cluster/infra_storage_single.yml
+++ b/salt/control/cluster/infra_storage_single.yml
@@ -28,3 +28,4 @@
               backend: ${_param:infra_storage_backend_image}
               size: infra.storage
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_storage}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/infra_version_control_single.yml b/salt/control/cluster/infra_version_control_single.yml
index a77f959..83e2911 100644
--- a/salt/control/cluster/infra_version_control_single.yml
+++ b/salt/control/cluster/infra_version_control_single.yml
@@ -28,3 +28,4 @@
               backend: ${_param:infra_version_control_backend_image}
               size: infra.version_control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_version_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
index 4ea65b5..b4dd21a 100644
--- a/salt/control/cluster/kubernetes_control_cluster.yml
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:kubernetes_control_backend_image}
               size: kubernetes.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ctl02:
               name: ${_param:kubernetes_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:kubernetes_control_backend_image}
               size: kubernetes.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ctl03:
               name: ${_param:kubernetes_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:kubernetes_control_backend_image}
               size: kubernetes.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index 35e559c..4addc97 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:kubernetes_proxy_backend_image}
               size: kubernetes.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             prx02:
               name: ${_param:kubernetes_proxy_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,4 +37,5 @@
               backend: ${_param:kubernetes_proxy_backend_image}
               size: kubernetes.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_kubernetes_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
 
diff --git a/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
index f3de786..eac3a27 100644
--- a/salt/control/cluster/opencontrail_analytics_cluster.yml
+++ b/salt/control/cluster/opencontrail_analytics_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             nal02:
               name: ${_param:opencontrail_analytics_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             nal03:
               name: ${_param:opencontrail_analytics_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:opencontrail_analytics_backend_image}
               size: opencontrail.analytics
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_analytics}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
index 2189738..4ee6528 100644
--- a/salt/control/cluster/opencontrail_control_cluster.yml
+++ b/salt/control/cluster/opencontrail_control_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ntw02:
               name: ${_param:opencontrail_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ntw03:
               name: ${_param:opencontrail_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:opencontrail_control_backend_image}
               size: opencontrail.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_opencontrail_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_barbican_cluster.yml b/salt/control/cluster/openstack_barbican_cluster.yml
index ed82bd4..0d7df7c 100644
--- a/salt/control/cluster/openstack_barbican_cluster.yml
+++ b/salt/control/cluster/openstack_barbican_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_barbican_backend_image}
               size: openstack.barbican
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             kmn02:
               name: ${_param:openstack_barbican_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_barbican_backend_image}
               size: openstack.barbican
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             kmn03:
               name: ${_param:openstack_barbican_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_barbican_backend_image}
               size: openstack.barbican
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_barbican}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_baremetal_cluster.yml b/salt/control/cluster/openstack_baremetal_cluster.yml
index faad1e9..514b56b 100644
--- a/salt/control/cluster/openstack_baremetal_cluster.yml
+++ b/salt/control/cluster/openstack_baremetal_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_baremetal_backend_image}
               size: openstack.baremetal
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             bmt02:
               name: ${_param:openstack_baremetal_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_baremetal_backend_image}
               size: openstack.baremetal
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             bmt03:
               name: ${_param:openstack_baremetal_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_baremetal_backend_image}
               size: openstack.baremetal
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_baremetal_single.yml b/salt/control/cluster/openstack_baremetal_single.yml
index 59d2c51..fead5fc 100644
--- a/salt/control/cluster/openstack_baremetal_single.yml
+++ b/salt/control/cluster/openstack_baremetal_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:openstack_baremetal_backend_image}
               size: openstack.baremetal
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_baremetal}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index 3d2bacd..058210e 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:openstack_benchmark_backend_image}
               size: openstack.benchmark
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_benchmark}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
index ae724e9..7ca2fdc 100644
--- a/salt/control/cluster/openstack_billing_single.yml
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -28,3 +28,4 @@
               backend: ${_param:openstack_billing_backend_image}
               size: openstack.billing
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_billing}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
index 8ed8a5e..d3e5c5d 100644
--- a/salt/control/cluster/openstack_control_cluster.yml
+++ b/salt/control/cluster/openstack_control_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ctl02:
               name: ${_param:openstack_control_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             ctl03:
               name: ${_param:openstack_control_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_control_backend_image}
               size: openstack.control
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_control}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
index 56ecd2f..9391d06 100644
--- a/salt/control/cluster/openstack_database_cluster.yml
+++ b/salt/control/cluster/openstack_database_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             dbs02:
               name: ${_param:openstack_database_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             dbs03:
               name: ${_param:openstack_database_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_dns_cluster.yml b/salt/control/cluster/openstack_dns_cluster.yml
index 62120d0..1a71972 100644
--- a/salt/control/cluster/openstack_dns_cluster.yml
+++ b/salt/control/cluster/openstack_dns_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_dns_backend_image}
               size: openstack.dns
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             dns02:
               name: ${_param:openstack_dns_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
               backend: ${_param:openstack_dns_backend_image}
               size: openstack.dns
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_dns}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index dd64751..e69d307 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_gateway_backend_image}
               size: openstack.gateway
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             gtw02:
               name: ${_param:openstack_gateway_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_gateway_backend_image}
               size: openstack.gateway
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             gtw03:
               name: ${_param:openstack_gateway_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_gateway_backend_image}
               size: openstack.gateway
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_gateway_single.yml b/salt/control/cluster/openstack_gateway_single.yml
index 285385c..d23e801 100644
--- a/salt/control/cluster/openstack_gateway_single.yml
+++ b/salt/control/cluster/openstack_gateway_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:openstack_gateway_backend_image}
               size: openstack.gateway
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_gateway}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
index 25f959b..6e18e19 100644
--- a/salt/control/cluster/openstack_manila_cluster.yml
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_manila_backend_image}
               size: openstack.manila
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             share02:
               name: ${_param:openstack_share_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_manila_backend_image}
               size: openstack.manila
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             share03:
               name: ${_param:openstack_share_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_manila_backend_image}
               size: openstack.manila
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_manila}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
index cccc408..7adf455 100644
--- a/salt/control/cluster/openstack_message_queue_cluster.yml
+++ b/salt/control/cluster/openstack_message_queue_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             msg02:
               name: ${_param:openstack_message_queue_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             msg03:
               name: ${_param:openstack_message_queue_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_message_queue_backend_image}
               size: openstack.message_queue
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_message_queue}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_proxy_cluster.yml b/salt/control/cluster/openstack_proxy_cluster.yml
index 4027e00..673b705 100644
--- a/salt/control/cluster/openstack_proxy_cluster.yml
+++ b/salt/control/cluster/openstack_proxy_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             prx02:
               name: ${_param:openstack_proxy_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,3 +37,4 @@
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
index 386d024..1d24859 100644
--- a/salt/control/cluster/openstack_proxy_single.yml
+++ b/salt/control/cluster/openstack_proxy_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:openstack_proxy_backend_image}
               size: openstack.proxy
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_proxy}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index d53bb45..a1f7667 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mdb02:
               name: ${_param:openstack_telemetry_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mdb03:
               name: ${_param:openstack_telemetry_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:openstack_telemetry_backend_image}
               size: openstack.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/openstack_upgrade_single.yml b/salt/control/cluster/openstack_upgrade_single.yml
index 6223867..783a66f 100644
--- a/salt/control/cluster/openstack_upgrade_single.yml
+++ b/salt/control/cluster/openstack_upgrade_single.yml
@@ -28,3 +28,4 @@
               backend: ${_param:openstack_upgrade_backend_image}
               size: openstack.upgrade
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_upgrade}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
index 57cef8e..d013402 100644
--- a/salt/control/cluster/rsyslog_single.yml
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:rsyslog_backend_image}
               size: infra.rsyslog
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_infra_rsyslog}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
index 8e979ca..953e0e6 100644
--- a/salt/control/cluster/stacklight_log_cluster.yml
+++ b/salt/control/cluster/stacklight_log_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:stacklight_log_backend_image}
               size: stacklight.log
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             log02:
               name: ${_param:stacklight_log_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:stacklight_log_backend_image}
               size: stacklight.log
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             log03:
               name: ${_param:stacklight_log_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:stacklight_log_backend_image}
               size: stacklight.log
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_log}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
index 169f096..cff0961 100644
--- a/salt/control/cluster/stacklight_server_cluster.yml
+++ b/salt/control/cluster/stacklight_server_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:stacklight_server_backend_image}
               size: stacklight.server
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mon02:
               name: ${_param:stacklight_monitor_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:stacklight_server_backend_image}
               size: stacklight.server
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mon03:
               name: ${_param:stacklight_monitor_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:stacklight_server_backend_image}
               size: stacklight.server
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_server}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
index c360b0e..72f0f02 100644
--- a/salt/control/cluster/stacklight_telemetry_cluster.yml
+++ b/salt/control/cluster/stacklight_telemetry_cluster.yml
@@ -29,6 +29,7 @@
               backend: ${_param:stacklight_telemetry_backend_image}
               size: stacklight.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mtr02:
               name: ${_param:stacklight_telemetry_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
@@ -36,6 +37,7 @@
               backend: ${_param:stacklight_telemetry_backend_image}
               size: stacklight.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
             mtr03:
               name: ${_param:stacklight_telemetry_node03_hostname}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
@@ -43,3 +45,4 @@
               backend: ${_param:stacklight_telemetry_backend_image}
               size: stacklight.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}
diff --git a/salt/control/cluster/stacklight_telemetry_single.yml b/salt/control/cluster/stacklight_telemetry_single.yml
index 709dc95..dec779d 100644
--- a/salt/control/cluster/stacklight_telemetry_single.yml
+++ b/salt/control/cluster/stacklight_telemetry_single.yml
@@ -29,3 +29,4 @@
               backend: ${_param:stacklight_telemetry_backend_image}
               size: stacklight.telemetry
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_stacklight_telemetry}
+              cpu_mode: ${_param:salt_control_cluster_qemu_cpu_mode}