diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster/ceph-ha/infra/init.yml
index 45acce4..ff46b98 100644
--- a/classes/cluster/ceph-ha/infra/init.yml
+++ b/classes/cluster/ceph-ha/infra/init.yml
@@ -2,7 +2,6 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo.saltstack.xenial
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - cluster.ceph-ha.ceph
diff --git a/classes/cluster/k8s-aio-contrail/opencontrail/control.yml b/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
index e92d538..a3c7b65 100644
--- a/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.rabbitmq.server.cluster
 - system.opencontrail.control.cluster
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 0fcc165..2f971f0 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -38,11 +38,8 @@
           enabled: ${_param:kubernetes_helm_enabled}
         calico_policy:
           enabled: ${_param:kubernetes_calico_policy_enabled}
-          image: ${_param:kubernetes_calico_policy_image}
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_image: ${_param:kubernetes_netchecker_agent_image}
-          server_image: ${_param:kubernetes_netchecker_server_image}
           agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
         dns:
           enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 02e61af..37b5ac0 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -21,23 +21,16 @@
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
 
     # component docker images
-    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
     kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
     kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
     kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
-    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
-    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_genie_image: mirantis/cnigenie:latest
 
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
index 2cccdfa..deececa 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/init.yml
@@ -31,7 +31,7 @@
     kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 4dd4bc3..c5dcc3d 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -37,11 +37,8 @@
           enabled: ${_param:kubernetes_helm_enabled}
         calico_policy:
           enabled: ${_param:kubernetes_calico_policy_enabled}
-          image: ${_param:kubernetes_calico_policy_image}
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_image: ${_param:kubernetes_netchecker_agent_image}
-          server_image: ${_param:kubernetes_netchecker_server_image}
           agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
         dns:
           enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index fbbcb8d..42edb2a 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -21,23 +21,16 @@
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
 
     # component docker images
-    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
     kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
     kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
     kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
-    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
-    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
 
     # switches of addons
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 07f5cb4..f632a9e 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -25,7 +25,7 @@
     kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index a1e3f0b..c584f30 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster4_0
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index a41ddbc..27a3403 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -29,7 +29,7 @@
     kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 50e7e6d..d3e17c7 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/model-manager/model_manager/dashboard.yml b/classes/cluster/model-manager/model_manager/dashboard.yml
index db4a614..c2fea60 100644
--- a/classes/cluster/model-manager/model_manager/dashboard.yml
+++ b/classes/cluster/model-manager/model_manager/dashboard.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.model_manager.server.integration
 - cluster.model-manager.model_manager.identity
diff --git a/classes/cluster/os-aio-contrail/opencontrail/control.yml b/classes/cluster/os-aio-contrail/opencontrail/control.yml
index 7eed258..2e2b211 100644
--- a/classes/cluster/os-aio-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-aio-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-aio-contrail/openstack/compute.yml b/classes/cluster/os-aio-contrail/openstack/compute.yml
index 9cff45b..9b4c00f 100755
--- a/classes/cluster/os-aio-contrail/openstack/compute.yml
+++ b/classes/cluster/os-aio-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.opencontrail.compute.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-aio-contrail/openstack/control.yml b/classes/cluster/os-aio-contrail/openstack/control.yml
index c1d42eb..70d4058 100755
--- a/classes/cluster/os-aio-contrail/openstack/control.yml
+++ b/classes/cluster/os-aio-contrail/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.single
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-aio-contrail/openstack/dashboard.yml b/classes/cluster/os-aio-contrail/openstack/dashboard.yml
index a45f059..f6f8adc 100755
--- a/classes/cluster/os-aio-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-aio-contrail/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/os-aio-ovs/openstack/compute.yml b/classes/cluster/os-aio-ovs/openstack/compute.yml
index 0e39e1d..2cd92d5 100644
--- a/classes/cluster/os-aio-ovs/openstack/compute.yml
+++ b/classes/cluster/os-aio-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - service.neutron.compute.single
 - cluster.os-aio-ovs
diff --git a/classes/cluster/os-aio-ovs/openstack/control.yml b/classes/cluster/os-aio-ovs/openstack/control.yml
index 9e00d09..4500664 100644
--- a/classes/cluster/os-aio-ovs/openstack/control.yml
+++ b/classes/cluster/os-aio-ovs/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.single
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-aio-ovs/openstack/dashboard.yml b/classes/cluster/os-aio-ovs/openstack/dashboard.yml
index 7faef18..43c8cf2 100644
--- a/classes/cluster/os-aio-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-aio-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.os-aio-ovs
 parameters:
diff --git a/classes/cluster/os-aio-ovs/openstack/gateway.yml b/classes/cluster/os-aio-ovs/openstack/gateway.yml
index 8e12b86..014d7e4 100644
--- a/classes/cluster/os-aio-ovs/openstack/gateway.yml
+++ b/classes/cluster/os-aio-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - service.neutron.gateway.single
 - cluster.os-aio-ovs
 parameters:
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index 1286459..93bc439 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -6,7 +6,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.docker_legacy
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster4_0
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index c97db35..b30902b 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster4_0
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index 787fce7..d5105fd 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
index 9567d6e..b37cf4e 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.cluster
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
index 8c9ec86..325eb9d 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
index 98924b8..b4d8901 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.contrail
 - system.opencontrail.compute.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
index 19ec724..b2563f6 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.contrail
 
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml b/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
index 110d389..899afb7 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
index 47f3f44..8a4ac5f 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
index 3a410db..e68e15e 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.cluster
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 06477ef..1d2b5e0 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index ce6c800..7aea4e5 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-contrail/openstack/dashboard.yml b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
index 625ac5c..070c144 100755
--- a/classes/cluster/os-ha-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
index bc79f5e..6497fec 100644
--- a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.ceph
 - cluster.os-ha-ovs-ceph.ceph
 - cluster.os-ha-ovs-ceph
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml b/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
index 8c5c79c..2c6da47 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/control.yml b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
index 59bbc6f..e96f218 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
index 0a98537..7d0fc6a 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.os-ha-ovs-ceph
 parameters:
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
index 618a98a..d3ea296 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.os-ha-ovs-ceph
 parameters:
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
index b1ab980..62cd8a5 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/control.yml b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
index 20d2497..19d699b 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.storage.loopback
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
index a6531c0..55d1050 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.os-ha-ovs-pike
 parameters:
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
index 58201bc..39e2009 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.os-ha-ovs-pike
 parameters:
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/compute.yml b/classes/cluster/os-ha-ovs-syndic/openstack/compute.yml
index 07646fc..674b37b 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/control.yml b/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
index 0b7f2a2..2dcffc7 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
index 02882ae..f2c8000 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.cluster
 - cluster.os-ha-ovs-syndic
 parameters:
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml b/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
index d38b87a..81171c5 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs
 parameters:
diff --git a/classes/cluster/os-ha-ovs/openstack/compute.yml b/classes/cluster/os-ha-ovs/openstack/compute.yml
index 0a8a970..113af20 100644
--- a/classes/cluster/os-ha-ovs/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/os-ha-ovs/openstack/control.yml b/classes/cluster/os-ha-ovs/openstack/control.yml
index 4ed5272..acbe53d 100644
--- a/classes/cluster/os-ha-ovs/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.storage.loopback
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/os-ha-ovs/openstack/dashboard.yml b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
index 9ed2ff7..d6e13a2 100644
--- a/classes/cluster/os-ha-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.os-ha-ovs
 parameters:
diff --git a/classes/cluster/os-ha-ovs/openstack/gateway.yml b/classes/cluster/os-ha-ovs/openstack/gateway.yml
index 4e42807..87f54db 100644
--- a/classes/cluster/os-ha-ovs/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.os-ha-ovs
 parameters:
diff --git a/classes/cluster/sl-k8s-contrail/opencontrail/control.yml b/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
index bc91b83..007dcd2 100644
--- a/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.rabbitmq.server.cluster
 - system.opencontrail.control.cluster
diff --git a/classes/cluster/sl-os-contrail/opencontrail/control.yml b/classes/cluster/sl-os-contrail/opencontrail/control.yml
index 7c5e60b..eba2be8 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/sl-os-contrail/openstack/compute.yml b/classes/cluster/sl-os-contrail/openstack/compute.yml
index e010b73..c523b7c 100755
--- a/classes/cluster/sl-os-contrail/openstack/compute.yml
+++ b/classes/cluster/sl-os-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.ceilometer.agent.cluster
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index 6adac4a..cce2588 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/sl-os-contrail/openstack/dashboard.yml b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
index b9d1ca2..1fc11c0 100755
--- a/classes/cluster/sl-os-contrail/openstack/dashboard.yml
+++ b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/sl-os-ovs/openstack/compute.yml b/classes/cluster/sl-os-ovs/openstack/compute.yml
index bbec98e..973d9c1 100644
--- a/classes/cluster/sl-os-ovs/openstack/compute.yml
+++ b/classes/cluster/sl-os-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index f1bc2a0..b5746f3 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/sl-os-ovs/openstack/dashboard.yml b/classes/cluster/sl-os-ovs/openstack/dashboard.yml
index 33053f4..1746150 100644
--- a/classes/cluster/sl-os-ovs/openstack/dashboard.yml
+++ b/classes/cluster/sl-os-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.sl-os-ovs
 parameters:
diff --git a/classes/cluster/sl-os-ovs/openstack/gateway.yml b/classes/cluster/sl-os-ovs/openstack/gateway.yml
index d38b87a..81171c5 100644
--- a/classes/cluster/sl-os-ovs/openstack/gateway.yml
+++ b/classes/cluster/sl-os-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
index cf2722e..02133af 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
index 8f4a5ff..fc50e87 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
index 177b577..24547a9 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.horizon.server.single
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
index 2794889..6632378 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-mitaka-dvr-trusty
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index d000096..06eecb0 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index 20c3b3d..0fbc136 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
index 6b484c5..dfbefeb 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.horizon.server.single
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index 0717926..6a295d2 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-mitaka-dvr
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
index 7646ca0..5c73df5 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index bfe22fc..e0ba2ce 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
index 177b577..24547a9 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.horizon.server.single
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
index 0aa1032..6f401b9 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-mitaka-ovs-trusty
 parameters:
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
index fa6b011..da5fd59 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index a734d72..7a6bf3e 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
index 6b484c5..dfbefeb 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.horizon.server.single
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
index 03d6708..fbdad46 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-mitaka-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
index 97c19d3..9dc67aa 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
index 7fe891b..1fe59b6 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
index 91813d2..45d20c7 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp-newton-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
index 5322f4f..77738dd 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-newton-dvr
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
index 1031c6f..24ed0fc 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
index 28aa6d3..c65de2c 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
index 8aa3cd7..cb66294 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp-newton-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
index a6370f3..7953572 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-newton-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index c9c41a8..a0fa510 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -18,6 +18,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack.designate
+- system.nginx.server.proxy.openstack.glance_registry
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
@@ -35,6 +36,8 @@
 - system.designate.server.cluster
 - system.galera.server.cluster
 - service.galera.ssl
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
 - system.galera.server.database.heat
@@ -62,8 +65,11 @@
     salt_minion_ca_authority: salt_master_ca
     ### nginx ssl sites settings
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
@@ -76,18 +82,13 @@
     nginx_proxy_openstack_heat_host: 127.0.0.1
     nginx_proxy_openstack_designate_host: 127.0.0.1
     apache_manila_api_address: ${_param:single_address}
-    apache_manila_ssl: ${_param:nginx_proxy_ssl}
     apache_keystone_api_host: ${_param:single_address}
-    apache_keystone_ssl: ${_param:nginx_proxy_ssl}
     apache_barbican_api_address: ${_param:cluster_local_address}
     apache_barbican_api_host: ${_param:single_address}
-    apache_barbican_ssl: ${_param:nginx_proxy_ssl}
     apache_nova_placement_api_address: ${_param:cluster_local_address}
-    apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
     barbican_dogtag_nss_password: workshop
     barbican_dogtag_host: ${_param:cluster_vip_address}
     apache_cinder_api_address: ${_param:cluster_local_address}
-    apache_cinder_ssl: ${_param:nginx_proxy_ssl}
     # dogtag listens on 8443 but there is no way to bind it to
     # Specific IP, as on this setup dogtag installed on ctl nodes
     # Change port on haproxy side to avoid binding conflict.
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 95066cb..017a30d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -220,6 +220,8 @@
       - "*"
     barbican_integration_enabled: true
     galera_ssl_enabled: true
+    nginx_proxy_ssl_enabled: true
+    apache_ssl_enabled: true
     rabbitmq_ssl_enabled: true
     rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
   linux:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 6c1a501..5f2682b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -3,6 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.glance_registry
+- system.nginx.server.proxy.ssl
 - system.salt.minion.cert.proxy
 - cluster.virtual-mcp-pike-dvr-ssl-barbican
 parameters:
@@ -11,8 +13,6 @@
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
   nginx:
     server:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
index 090d2d1..4e3841c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -14,6 +14,8 @@
 - service.redis.server.single
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack.aodh
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - system.gnocchi.server.cluster
 - system.gnocchi.common.storage.incoming.redis
 - system.gnocchi.common.storage.file
@@ -37,16 +39,17 @@
     nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
     nginx_proxy_openstack_aodh_host: 127.0.0.1
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
       chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
     apache_gnocchi_api_address: ${_param:single_address}
     apache_panko_api_address: ${_param:single_address}
-    apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
-    apache_panko_ssl: ${_param:nginx_proxy_ssl}
     cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
     cluster_node01_address: ${_param:openstack_telemetry_node01_address}
     cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 077e701..dd0e060 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -17,6 +17,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack.designate
+- system.nginx.server.proxy.openstack.glance_registry
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
@@ -34,6 +35,8 @@
 - system.designate.server.cluster
 - system.galera.server.cluster
 - service.galera.ssl
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
 - system.galera.server.database.heat
@@ -56,10 +59,12 @@
   _param:
     keepalived_vip_interface: ens4
     salt_minion_ca_authority: salt_master_ca
-    ### nginx ssl sites settings
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
@@ -72,13 +77,10 @@
     nginx_proxy_openstack_heat_host: 127.0.0.1
     nginx_proxy_openstack_designate_host: 127.0.0.1
     apache_manila_api_address: ${_param:single_address}
-    apache_manila_ssl: ${_param:nginx_proxy_ssl}
     apache_keystone_api_host: ${_param:single_address}
-    apache_keystone_ssl: ${_param:nginx_proxy_ssl}
     apache_nova_placement_api_address: ${_param:cluster_local_address}
-    apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
     apache_cinder_api_address: ${_param:cluster_local_address}
-    apache_cinder_ssl: ${_param:nginx_proxy_ssl}
+
   rabbitmq:
     server:
       ssl:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 4b904f0..dc0111d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -217,6 +217,8 @@
       - "*"
     galera_ssl_enabled: true
     rabbitmq_ssl_enabled: true
+    nginx_proxy_ssl_enabled: true
+    apache_ssl_enabled: true
     rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
index 9344fee..b715bfe 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
@@ -3,6 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.glance_registry
+- system.nginx.server.proxy.ssl
 - system.salt.minion.cert.proxy
 - cluster.virtual-mcp-pike-dvr-ssl
 parameters:
@@ -11,8 +13,6 @@
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
   nginx:
     server:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index 6279073..8ad711d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -14,6 +14,8 @@
 - service.redis.server.single
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack.aodh
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - system.gnocchi.server.cluster
 - system.gnocchi.common.storage.incoming.redis
 - system.gnocchi.common.storage.file
@@ -37,16 +39,17 @@
     nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
     nginx_proxy_openstack_aodh_host: 127.0.0.1
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
       chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
     apache_gnocchi_api_address: ${_param:single_address}
     apache_panko_api_address: ${_param:single_address}
-    apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
-    apache_panko_ssl: ${_param:nginx_proxy_ssl}
     cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
     cluster_node01_address: ${_param:openstack_telemetry_node01_address}
     cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
index 4457e18..58c558d 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 3295d9c..9683fdf 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.cassandra
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
index 35583bf..74dfccc 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
index e25f34d..d8e18d9 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
index 7a60877..6dd9bba 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
index 1eb1dd0..78233dc 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp10-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
index 1c4767c..bf52c58 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
index fe22fbb..d593077 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
index 62bb45c..a23e60b 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
index 0a05705..ae748fc 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp10-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
index 8f6912d..343682a 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp10-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 1d93eb1..53c4f99 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
index f2f7bcd..465d7d2 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index b5a4177..0fd9d36 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -5,7 +5,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mos10
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
index 2e24e3b..ffba01d 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index bcc9094..4551ca2 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index dc0970b..23b5454 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.ceilometer.agent.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 36536bd..9f73698 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
index 1377fec..99a5dd2 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
index 93d04a5..c1acb5d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index 7f1abcf..e5e6438 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 2aac823..b77180c 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp11-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp11-dvr/openstack/gateway.yml
index 3a35140..116bc16 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-dvr
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 501769f..74b1eb1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -40,11 +40,8 @@
           enabled: ${_param:kubernetes_helm_enabled}
         calico_policy:
           enabled: ${_param:kubernetes_calico_policy_enabled}
-          image: ${_param:kubernetes_calico_policy_image}
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_image: ${_param:kubernetes_netchecker_agent_image}
-          server_image: ${_param:kubernetes_netchecker_server_image}
           agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
         dns:
           enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index eb22748..5308cac 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -21,19 +21,13 @@
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
 
     # component docker images
-    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
     kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
-    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.2
-    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.2
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index f79dc4f..c587d0d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -29,7 +29,7 @@
     kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
     kubernetes_criproxy_version: v0.11.0
     kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
-    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.3
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
     kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
index fb35dd4..9364637 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
index 2e2ec97..53d2790 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
index 950d6ff..ea1803b 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - system.horizon.server.plugin.theme
 - cluster.virtual-mcp11-ovs-dpdk
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
index a6e99c8..c7f6742 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs-dpdk
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
index 27286fc..46d679b 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/baremetal.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.ironic.api.cluster # deploy only api (heartbeat and lookup endpoints are open)
 - system.ironic.conductor.cluster
 - system.ironic.tftpd_hpa
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
index b079226..996c3a9 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
index 0781ed9..455c8d9 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.salt.minion.cert.mysql.server
 - system.salt.minion.cert.rabbitmq_server
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
index 858712d..38eb344 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp11-ovs-ironic-ssl
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
index d7a2b2b..1b83042 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs-ironic-ssl
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
index b361ff2..6de0f8e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.ironic.api.cluster # deploy only api (heartbeat and lookup endpoints are open)
 - system.ironic.conductor.cluster
 - system.ironic.tftpd_hpa
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
index 4b053a8..21f9bab 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index c217e9e..96fb246 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.salt.minion.cert.mysql.server
 - system.salt.minion.cert.rabbitmq_server
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
index b4994ec..cacf94e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp11-ovs-ironic
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
index f5d851e..2bfe32c 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs-ironic
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
index 53f3daa..3715500 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 7617480..f4f2004 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index 5e06f50..abb715d 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-mcp11-ovs
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
index d38b87a..81171c5 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp11-ovs
 parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index 663be7e..f442b42 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -57,6 +57,8 @@
     neutron_compute_dvr: False
     neutron_compute_agent_mode: legacy
     neutron_compute_external_access: False
+    neutron_enable_bgp_vpn: True
+    neutron_bgp_vpn_driver: bagpipe
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index c085eab..1889149 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -16,6 +16,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack.designate
+- system.nginx.server.proxy.openstack.glance_registry
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
@@ -51,6 +52,8 @@
 - system.haproxy.proxy.listen.openstack.placement
 - system.haproxy.proxy.listen.openstack.manila
 - system.manila.control.cluster
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - cluster.virtual-offline-ssl.openstack.dns
 - cluster.virtual-offline-ssl
 parameters:
@@ -59,8 +62,11 @@
     salt_minion_ca_authority: salt_master_ca
     ### nginx ssl sites settings
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
@@ -73,18 +79,13 @@
     nginx_proxy_openstack_heat_host: 127.0.0.1
     nginx_proxy_openstack_designate_host: 127.0.0.1
     apache_manila_api_address: ${_param:single_address}
-    apache_manila_ssl: ${_param:nginx_proxy_ssl}
     apache_keystone_api_host: ${_param:single_address}
-    apache_keystone_ssl: ${_param:nginx_proxy_ssl}
     apache_barbican_api_address: ${_param:cluster_local_address}
     apache_barbican_api_host: ${_param:single_address}
-    apache_barbican_ssl: ${_param:nginx_proxy_ssl}
     apache_nova_placement_api_address: ${_param:cluster_local_address}
-    apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
     barbican_dogtag_nss_password: workshop
     barbican_dogtag_host: ${_param:cluster_vip_address}
     apache_cinder_api_address: ${_param:cluster_local_address}
-    apache_cinder_ssl: ${_param:nginx_proxy_ssl}
     # dogtag listens on 8443 but there is no way to bind it to
     # Specific IP, as on this setup dogtag installed on ctl nodes
     # Change port on haproxy side to avoid binding conflict.
diff --git a/classes/cluster/virtual-offline-ssl/openstack/init.yml b/classes/cluster/virtual-offline-ssl/openstack/init.yml
index 5f8421f..13bbb5d 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/init.yml
@@ -218,6 +218,8 @@
     ceilometer_agent_default_polling_meters:
       - "*"
     barbican_integration_enabled: true
+    nginx_proxy_ssl_enabled: true
+    apache_ssl_enabled: true
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index ffa74f3..6bf692a 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -3,6 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.glance_registry
+- system.nginx.server.proxy.ssl
 - system.salt.minion.cert.proxy
 - cluster.virtual-offline-ssl
 parameters:
@@ -11,8 +13,6 @@
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
   nginx:
     server:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
index e2b5d3a..a59b9a7 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -16,6 +16,8 @@
 - service.redis.server.single
 - system.nginx.server.single
 - system.nginx.server.proxy.openstack.aodh
+- system.apache.server.ssl
+- system.nginx.server.proxy.ssl
 - system.gnocchi.server.cluster
 - system.gnocchi.common.storage.incoming.redis
 - system.gnocchi.common.storage.file
@@ -39,16 +41,17 @@
     nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
     nginx_proxy_openstack_aodh_host: 127.0.0.1
     nginx_proxy_ssl:
-      enabled: true
-      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    apache_ssl:
       authority: "${_param:salt_minion_ca_authority}"
       key_file: "/etc/ssl/private/internal_proxy.key"
       cert_file: "/etc/ssl/certs/internal_proxy.crt"
       chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
     apache_gnocchi_api_address: ${_param:single_address}
     apache_panko_api_address: ${_param:single_address}
-    apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
-    apache_panko_ssl: ${_param:nginx_proxy_ssl}
     cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
     cluster_node01_address: ${_param:openstack_telemetry_node01_address}
     cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
diff --git a/classes/system b/classes/system
index ca6d896..7259a78 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit ca6d8967921205de879f49f37ebb7d0cbb33c5ee
+Subproject commit 7259a78b010ec39096d0f067a9366ab1c1222df7