diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index a0d4e1b..6428fa7 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -33,6 +33,9 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
+- system.glance.client.image.cirros
+- system.glance.client.image.ubuntu_xenial
+- system.nova.client.flavor.default
 - cluster.os-ha-contrail-40.openstack.proxy
 - cluster.os-ha-contrail-40
 parameters:
@@ -46,6 +49,11 @@
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
+    system:
+      kernel:
+        sysctl:
+          net.ipv4.conf.ens3.forwarding: 1
+          net.ipv4.conf.ens3.send_redirects: 0
     network:
       interface:
         ens4:
@@ -54,6 +62,11 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+          # This is workaround for different interface
+          pre_up_cmds:
+          - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+          post_down_cmds:
+          - "iptables -t nat -F POSTROUTING"
   nginx:
     server:
       site:
diff --git a/classes/cluster/os-ha-contrail-40/init.yml b/classes/cluster/os-ha-contrail-40/init.yml
index 7947dac..ca9b37a 100644
--- a/classes/cluster/os-ha-contrail-40/init.yml
+++ b/classes/cluster/os-ha-contrail-40/init.yml
@@ -10,3 +10,16 @@
 - cluster.os-ha-contrail-40.opencontrail
 - cluster.os-ha-contrail-40.openstack
 - cluster.overrides
+parameters:
+  salt:
+    minion:
+      trusted_ca_minions:
+        - cfg01
+  linux:
+    network:
+      host:
+        vsrx1:
+          address: 172.16.10.131
+          names:
+          - vsrx1
+          - vsrx1.${_param:cluster_domain}
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index 1848dc3..e8b854d 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -1,9 +1,11 @@
 classes:
+- service.docker.host
 - system.linux.system.lowmem
 - system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
 - 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.opencontrail.client.resource.edge_router
 - system.opencontrail.control.cluster4_0
@@ -13,6 +15,7 @@
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
 - system.haproxy.proxy.listen.opencontrail.analytics
+- system.docker.client
 - cluster.os-ha-contrail-40
 parameters:
   _param:
@@ -42,25 +45,8 @@
       instance:
         VIP:
           virtual_router_id: 144
-  opencontrail:
-    web:
-      database:
-        port: 9042
-      network:
-        host: ${_param:openstack_control_address}
-      identity:
-        host: ${_param:openstack_control_address}
-    common:
-      network:
-        host: ${_param:openstack_control_address}
-      identity:
-        host: ${_param:openstack_control_address}
-    config:
-      network:
-        host: ${_param:openstack_control_address}
-      identity:
-        host: ${_param:openstack_control_address}
-      message_queue:
-        engine: rabbitmq
-        host: ${_param:openstack_control_address}
-        port: 5672
+  docker:
+    host:
+      pkgs:
+        - docker-engine
+        - python-docker
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
index b460eb0..ad22679 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
@@ -4,7 +4,9 @@
     opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
     opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
-
+    opencontrail_analytics_node01_hostname: ntw01
+    opencontrail_analytics_node02_hostname: ntw02
+    opencontrail_analytics_node03_hostname: ntw03
     opencontrail_control_address: 172.16.10.252
     opencontrail_control_node01_hostname: ntw01
     opencontrail_control_node02_hostname: ntw02
@@ -13,4 +15,3 @@
     opencontrail_control_node02_address: 172.16.10.112
     opencontrail_control_node03_address: 172.16.10.113
     opencontrail_control_interface_name: eth1
-  
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index a96d05d..d95205e 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -36,6 +36,9 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
+- system.glance.client.image.cirros
+- system.glance.client.image.ubuntu_xenial
+- system.nova.client.flavor.default
 - cluster.os-ha-contrail.openstack.proxy
 - cluster.os-ha-contrail
 parameters:
@@ -49,6 +52,11 @@
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
+    system:
+      kernel:
+        sysctl:
+          net.ipv4.conf.ens3.forwarding: 1
+          net.ipv4.conf.ens3.send_redirects: 0
     network:
       interface:
         ens4:
@@ -57,6 +65,12 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+          # This is workaround for different interface
+          pre_up_cmds:
+          - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+          post_down_cmds:
+          - "iptables -t nat -F POSTROUTING"
+
   nginx:
     server:
       site:
diff --git a/classes/cluster/os-ha-contrail/init.yml b/classes/cluster/os-ha-contrail/init.yml
index 8502db0..0fe368b 100755
--- a/classes/cluster/os-ha-contrail/init.yml
+++ b/classes/cluster/os-ha-contrail/init.yml
@@ -15,3 +15,12 @@
     minion:
       trusted_ca_minions:
         - cfg01
+  linux:
+    network:
+      host:
+        vsrx1:
+          address: 172.16.10.131
+          names:
+          - vsrx1
+          - vsrx1.${_param:cluster_domain}
+
diff --git a/classes/cluster/os-ha-contrail/opencontrail/init.yml b/classes/cluster/os-ha-contrail/opencontrail/init.yml
index 9b3acda..fea67dd 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/init.yml
@@ -4,7 +4,9 @@
     opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
     opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
-
+    opencontrail_analytics_node01_hostname: ntw01
+    opencontrail_analytics_node02_hostname: ntw02
+    opencontrail_analytics_node03_hostname: ntw03
     opencontrail_control_address: 172.16.10.252
     opencontrail_control_node01_hostname: ntw01
     opencontrail_control_node02_hostname: ntw02
@@ -12,4 +14,3 @@
     opencontrail_control_node01_address: 172.16.10.111
     opencontrail_control_node02_address: 172.16.10.112
     opencontrail_control_node03_address: 172.16.10.113
-  
diff --git a/classes/cluster/virtual-mcp11-dvr/.env b/classes/cluster/virtual-mcp11-dvr/.env
index 5dd2f55..1409139 100644
--- a/classes/cluster/virtual-mcp11-dvr/.env
+++ b/classes/cluster/virtual-mcp11-dvr/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx memcached collectd heka grafana"
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf"
diff --git a/classes/cluster/virtual-mcp11-ovs/.env b/classes/cluster/virtual-mcp11-ovs/.env
index 5dd2f55..1409139 100644
--- a/classes/cluster/virtual-mcp11-ovs/.env
+++ b/classes/cluster/virtual-mcp11-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx memcached collectd heka grafana"
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf"
diff --git a/classes/system b/classes/system
index effee04..1cf016f 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit effee0490ecfb00f1ed311143e7fc635700b6e0c
+Subproject commit 1cf016fcf3f283df4215efb7697b3a4dcfe4c9ac