diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 9bc2971..f9b8682 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -75,3 +75,8 @@
         cron:
           minute: 0
           hour: 2
+      cache:
+        security:
+          enabled: ${_param:aodh_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:aodh_memcache_secret_key}
diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index 106a1b6..c231be6 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -44,3 +44,8 @@
         cron:
           minute: 0
           hour: 2
+      cache:
+        security:
+          enabled: ${_param:aodh_memcache_security_enabled}
+          strategy: ${_param:openstack_memcache_security_strategy}
+          secret_key: ${_param:aodh_memcache_secret_key}
diff --git a/defaults/init.yml b/defaults/init.yml
index 558a1d0..089de14 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -24,3 +24,6 @@
     openstack_version: 'queens'
     # Docker artifact globals
     mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
+    # Other
+    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
+    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index aa39c0d..468778a 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -21,3 +21,6 @@
     # Heat
     heat_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     heat_memcache_secret_key: ''
+    # Aodh
+    aodh_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+    aodh_memcache_secret_key: ''
diff --git a/linux/system/repo_local/glusterfs.yml b/linux/system/repo_local/glusterfs.yml
index a3d122e..5d0ecd3 100644
--- a/linux/system/repo_local/glusterfs.yml
+++ b/linux/system/repo_local/glusterfs.yml
@@ -1,7 +1,6 @@
 # DEPRECATED since 2018.7+ release.
 # Please use system/repo/mcp/apt_mirantis
 parameters:
-  _param:
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/maas.yml b/linux/system/repo_local/maas.yml
index 43927a3..1a5b487 100644
--- a/linux/system/repo_local/maas.yml
+++ b/linux/system/repo_local/maas.yml
@@ -1,7 +1,6 @@
 # DEPRECATED since 2018.7+ release.
 # Please use system/repo/mcp/apt_mirantis
 parameters:
-  _param:
   linux:
     system:
       repo:
diff --git a/salt/control/cluster/ceph_mon_cluster.yml b/salt/control/cluster/ceph_mon_cluster.yml
index 39cee29..c94adaf 100644
--- a/salt/control/cluster/ceph_mon_cluster.yml
+++ b/salt/control/cluster/ceph_mon_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     ceph_mon_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/ceph_rgw_cluster.yml b/salt/control/cluster/ceph_rgw_cluster.yml
index e0109db..fe1e734 100644
--- a/salt/control/cluster/ceph_rgw_cluster.yml
+++ b/salt/control/cluster/ceph_rgw_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     ceph_rgw_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/cicd_control_cluster.yml b/salt/control/cluster/cicd_control_cluster.yml
index 33945e2..a1bb8fe 100644
--- a/salt/control/cluster/cicd_control_cluster.yml
+++ b/salt/control/cluster/cicd_control_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_integration_single.yml b/salt/control/cluster/infra_integration_single.yml
index 0c774ab..9b7be90 100644
--- a/salt/control/cluster/infra_integration_single.yml
+++ b/salt/control/cluster/infra_integration_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     infra_integration_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_maas_single.yml b/salt/control/cluster/infra_maas_single.yml
index 9bd4fe2..012d18c 100644
--- a/salt/control/cluster/infra_maas_single.yml
+++ b/salt/control/cluster/infra_maas_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     infra_maas_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_proxy_cluster.yml b/salt/control/cluster/infra_proxy_cluster.yml
index 00c9679..16c77f9 100644
--- a/salt/control/cluster/infra_proxy_cluster.yml
+++ b/salt/control/cluster/infra_proxy_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_proxy_single.yml b/salt/control/cluster/infra_proxy_single.yml
index 483b2d4..1b6f4d7 100644
--- a/salt/control/cluster/infra_proxy_single.yml
+++ b/salt/control/cluster/infra_proxy_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     infra_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_storage_single.yml b/salt/control/cluster/infra_storage_single.yml
index b6c0a85..e2d863d 100644
--- a/salt/control/cluster/infra_storage_single.yml
+++ b/salt/control/cluster/infra_storage_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     infra_storage_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/infra_version_control_single.yml b/salt/control/cluster/infra_version_control_single.yml
index d7e02d5..0b1dbee 100644
--- a/salt/control/cluster/infra_version_control_single.yml
+++ b/salt/control/cluster/infra_version_control_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     infra_version_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
index 252ccbf..f37160e 100644
--- a/salt/control/cluster/kubernetes_control_cluster.yml
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     kubernetes_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index 0a47f39..17dc02c 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     kubernetes_proxy_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
index b4e7b75..67056b9 100644
--- a/salt/control/cluster/opencontrail_analytics_cluster.yml
+++ b/salt/control/cluster/opencontrail_analytics_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     opencontrail_analytics_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
index 9d2fbb9..b3a5c63 100644
--- a/salt/control/cluster/opencontrail_control_cluster.yml
+++ b/salt/control/cluster/opencontrail_control_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_barbican_cluster.yml b/salt/control/cluster/openstack_barbican_cluster.yml
index b24c0fa..1e1f5c7 100644
--- a/salt/control/cluster/openstack_barbican_cluster.yml
+++ b/salt/control/cluster/openstack_barbican_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_barbican_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_baremetal_cluster.yml b/salt/control/cluster/openstack_baremetal_cluster.yml
index f166484..591a4db 100644
--- a/salt/control/cluster/openstack_baremetal_cluster.yml
+++ b/salt/control/cluster/openstack_baremetal_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_baremetal_single.yml b/salt/control/cluster/openstack_baremetal_single.yml
index 853f45e..eb30d2e 100644
--- a/salt/control/cluster/openstack_baremetal_single.yml
+++ b/salt/control/cluster/openstack_baremetal_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_baremetal_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index 83c18f5..43ea18f 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_benchmark_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
index 36f9824..33ef104 100644
--- a/salt/control/cluster/openstack_billing_single.yml
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_billing_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
index 328cfd0..f1c872e 100644
--- a/salt/control/cluster/openstack_control_cluster.yml
+++ b/salt/control/cluster/openstack_control_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_control_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
index acbcc36..c509f18 100644
--- a/salt/control/cluster/openstack_database_cluster.yml
+++ b/salt/control/cluster/openstack_database_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_database_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_dns_cluster.yml b/salt/control/cluster/openstack_dns_cluster.yml
index 6fcc546..dd73b75 100644
--- a/salt/control/cluster/openstack_dns_cluster.yml
+++ b/salt/control/cluster/openstack_dns_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_dns_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index 8475004..1bc35c2 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_gateway_single.yml b/salt/control/cluster/openstack_gateway_single.yml
index e240d12..4454e0b 100644
--- a/salt/control/cluster/openstack_gateway_single.yml
+++ b/salt/control/cluster/openstack_gateway_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_manila_cluster.yml b/salt/control/cluster/openstack_manila_cluster.yml
index 477d6ca..c670840 100644
--- a/salt/control/cluster/openstack_manila_cluster.yml
+++ b/salt/control/cluster/openstack_manila_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_manila_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
index f91faf6..ce81888 100644
--- a/salt/control/cluster/openstack_message_queue_cluster.yml
+++ b/salt/control/cluster/openstack_message_queue_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_message_queue_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_proxy_cluster.yml b/salt/control/cluster/openstack_proxy_cluster.yml
index 87a5176..309563f 100644
--- a/salt/control/cluster/openstack_proxy_cluster.yml
+++ b/salt/control/cluster/openstack_proxy_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
index ca5c751..1092394 100644
--- a/salt/control/cluster/openstack_proxy_single.yml
+++ b/salt/control/cluster/openstack_proxy_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_proxy_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index bbf6fd1..cce2c36 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     openstack_telemetry_backend_image: ${_param:salt_control_trusty_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/openstack_upgrade_single.yml b/salt/control/cluster/openstack_upgrade_single.yml
index 0b5e0fb..e9ea0b8 100644
--- a/salt/control/cluster/openstack_upgrade_single.yml
+++ b/salt/control/cluster/openstack_upgrade_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_upgrade_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
index dd64869..d79f439 100644
--- a/salt/control/cluster/rsyslog_single.yml
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     rsyslog_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
index 6d3dba9..ba60260 100644
--- a/salt/control/cluster/stacklight_log_cluster.yml
+++ b/salt/control/cluster/stacklight_log_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
index 8ab6a9d..f0bd970 100644
--- a/salt/control/cluster/stacklight_server_cluster.yml
+++ b/salt/control/cluster/stacklight_server_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_server_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
index 4a58a23..5eb6f94 100644
--- a/salt/control/cluster/stacklight_telemetry_cluster.yml
+++ b/salt/control/cluster/stacklight_telemetry_cluster.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/cluster/stacklight_telemetry_single.yml b/salt/control/cluster/stacklight_telemetry_single.yml
index 3012dc6..c6d6400 100644
--- a/salt/control/cluster/stacklight_telemetry_single.yml
+++ b/salt/control/cluster/stacklight_telemetry_single.yml
@@ -1,6 +1,5 @@
 parameters:
   _param:
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/cicd/compact.yml b/salt/control/placement/cicd/compact.yml
index 9f700f1..82e935c 100644
--- a/salt/control/placement/cicd/compact.yml
+++ b/salt/control/placement/cicd/compact.yml
@@ -6,7 +6,6 @@
     cicd_control_node01_hostname: cid01
     cicd_control_node02_hostname: cid02
     cicd_control_node03_hostname: cid03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/cicd/large.yml b/salt/control/placement/cicd/large.yml
index 9f700f1..82e935c 100644
--- a/salt/control/placement/cicd/large.yml
+++ b/salt/control/placement/cicd/large.yml
@@ -6,7 +6,6 @@
     cicd_control_node01_hostname: cid01
     cicd_control_node02_hostname: cid02
     cicd_control_node03_hostname: cid03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/cicd/medium.yml b/salt/control/placement/cicd/medium.yml
index 9f700f1..82e935c 100644
--- a/salt/control/placement/cicd/medium.yml
+++ b/salt/control/placement/cicd/medium.yml
@@ -6,7 +6,6 @@
     cicd_control_node01_hostname: cid01
     cicd_control_node02_hostname: cid02
     cicd_control_node03_hostname: cid03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/cicd/minimal.yml b/salt/control/placement/cicd/minimal.yml
index 9f700f1..82e935c 100644
--- a/salt/control/placement/cicd/minimal.yml
+++ b/salt/control/placement/cicd/minimal.yml
@@ -6,7 +6,6 @@
     cicd_control_node01_hostname: cid01
     cicd_control_node02_hostname: cid02
     cicd_control_node03_hostname: cid03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/cicd/small.yml b/salt/control/placement/cicd/small.yml
index 9f700f1..82e935c 100644
--- a/salt/control/placement/cicd/small.yml
+++ b/salt/control/placement/cicd/small.yml
@@ -6,7 +6,6 @@
     cicd_control_node01_hostname: cid01
     cicd_control_node02_hostname: cid02
     cicd_control_node03_hostname: cid03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     cicd_control_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/opencontrail/compact.yml b/salt/control/placement/opencontrail/compact.yml
index 584b65e..684ffa6 100644
--- a/salt/control/placement/opencontrail/compact.yml
+++ b/salt/control/placement/opencontrail/compact.yml
@@ -9,7 +9,6 @@
     opencontrail_analytics_node01_hostname: nal01
     opencontrail_analytics_node02_hostname: nal02
     opencontrail_analytics_node03_hostname: nal03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
diff --git a/salt/control/placement/opencontrail/large.yml b/salt/control/placement/opencontrail/large.yml
index d7e662c..d4c062e 100644
--- a/salt/control/placement/opencontrail/large.yml
+++ b/salt/control/placement/opencontrail/large.yml
@@ -9,7 +9,6 @@
     opencontrail_analytics_node01_hostname: nal01
     opencontrail_analytics_node02_hostname: nal02
     opencontrail_analytics_node03_hostname: nal03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
diff --git a/salt/control/placement/opencontrail/medium.yml b/salt/control/placement/opencontrail/medium.yml
index 448cd23..8fc9565 100644
--- a/salt/control/placement/opencontrail/medium.yml
+++ b/salt/control/placement/opencontrail/medium.yml
@@ -9,7 +9,6 @@
     opencontrail_analytics_node01_hostname: nal01
     opencontrail_analytics_node02_hostname: nal02
     opencontrail_analytics_node03_hostname: nal03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
diff --git a/salt/control/placement/opencontrail/minimal.yml b/salt/control/placement/opencontrail/minimal.yml
index 584b65e..684ffa6 100644
--- a/salt/control/placement/opencontrail/minimal.yml
+++ b/salt/control/placement/opencontrail/minimal.yml
@@ -9,7 +9,6 @@
     opencontrail_analytics_node01_hostname: nal01
     opencontrail_analytics_node02_hostname: nal02
     opencontrail_analytics_node03_hostname: nal03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
diff --git a/salt/control/placement/opencontrail/small.yml b/salt/control/placement/opencontrail/small.yml
index 584b65e..684ffa6 100644
--- a/salt/control/placement/opencontrail/small.yml
+++ b/salt/control/placement/opencontrail/small.yml
@@ -9,7 +9,6 @@
     opencontrail_analytics_node01_hostname: nal01
     opencontrail_analytics_node02_hostname: nal02
     opencontrail_analytics_node03_hostname: nal03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     opencontrail_control_backend_image: ${_param:salt_control_xenial_image_backend}
     opencontrail_analytics_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index 83f2254..6842f91 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -14,7 +14,6 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index f09d3f6..24bacb3 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -21,7 +21,6 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index 2419c74..113b095 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -17,7 +17,6 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index 83f2254..6842f91 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -14,7 +14,6 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index 83f2254..6842f91 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -14,7 +14,6 @@
     openstack_message_queue_node03_hostname: msg03
     openstack_proxy_node01_hostname: prx01
     openstack_proxy_node02_hostname: prx02
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_control_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
     openstack_message_queue_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/ovs/compact.yml b/salt/control/placement/ovs/compact.yml
index de0569c..88865f0 100644
--- a/salt/control/placement/ovs/compact.yml
+++ b/salt/control/placement/ovs/compact.yml
@@ -6,7 +6,6 @@
     openstack_gateway_node01_hostname: gtw01
     openstack_gateway_node02_hostname: gtw02
     openstack_gateway_node03_hostname: gtw03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/ovs/minimal.yml b/salt/control/placement/ovs/minimal.yml
index de0569c..88865f0 100644
--- a/salt/control/placement/ovs/minimal.yml
+++ b/salt/control/placement/ovs/minimal.yml
@@ -6,7 +6,6 @@
     openstack_gateway_node01_hostname: gtw01
     openstack_gateway_node02_hostname: gtw02
     openstack_gateway_node03_hostname: gtw03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/ovs/small.yml b/salt/control/placement/ovs/small.yml
index de0569c..88865f0 100644
--- a/salt/control/placement/ovs/small.yml
+++ b/salt/control/placement/ovs/small.yml
@@ -6,7 +6,6 @@
     openstack_gateway_node01_hostname: gtw01
     openstack_gateway_node02_hostname: gtw02
     openstack_gateway_node03_hostname: gtw03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     openstack_gateway_backend_image: ${_param:salt_control_xenial_image_backend}
   salt:
     control:
diff --git a/salt/control/placement/stacklight/compact.yml b/salt/control/placement/stacklight/compact.yml
index e03ea85..bed471a 100644
--- a/salt/control/placement/stacklight/compact.yml
+++ b/salt/control/placement/stacklight/compact.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_node01_hostname: mtr01
     stacklight_telemetry_node02_hostname: mtr02
     stacklight_telemetry_node03_hostname: mtr03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_monitor_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/stacklight/large.yml b/salt/control/placement/stacklight/large.yml
index 7b1f716..a3535b9 100644
--- a/salt/control/placement/stacklight/large.yml
+++ b/salt/control/placement/stacklight/large.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_node01_hostname: mtr01
     stacklight_telemetry_node02_hostname: mtr02
     stacklight_telemetry_node03_hostname: mtr03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_monitor_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/stacklight/medium.yml b/salt/control/placement/stacklight/medium.yml
index a9643fe..41429c8 100644
--- a/salt/control/placement/stacklight/medium.yml
+++ b/salt/control/placement/stacklight/medium.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_node01_hostname: mtr01
     stacklight_telemetry_node02_hostname: mtr02
     stacklight_telemetry_node03_hostname: mtr03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_monitor_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/stacklight/minimal.yml b/salt/control/placement/stacklight/minimal.yml
index e03ea85..bed471a 100644
--- a/salt/control/placement/stacklight/minimal.yml
+++ b/salt/control/placement/stacklight/minimal.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_node01_hostname: mtr01
     stacklight_telemetry_node02_hostname: mtr02
     stacklight_telemetry_node03_hostname: mtr03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_monitor_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}
diff --git a/salt/control/placement/stacklight/small.yml b/salt/control/placement/stacklight/small.yml
index fec0fbf..9223340 100644
--- a/salt/control/placement/stacklight/small.yml
+++ b/salt/control/placement/stacklight/small.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_node01_hostname: mtr01
     stacklight_telemetry_node02_hostname: mtr02
     stacklight_telemetry_node03_hostname: mtr03
-    salt_control_xenial_image_backend: /var/lib/libvirt/images/backends/xenial.qcow2
     stacklight_log_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_monitor_backend_image: ${_param:salt_control_xenial_image_backend}
     stacklight_telemetry_backend_image: ${_param:salt_control_xenial_image_backend}