diff --git a/kubernetes/files/kube-addons/dashboard/dashboard-deployment.yaml b/kubernetes/files/kube-addons/dashboard/dashboard-deployment.yaml
index 1a4167b..df130df 100644
--- a/kubernetes/files/kube-addons/dashboard/dashboard-deployment.yaml
+++ b/kubernetes/files/kube-addons/dashboard/dashboard-deployment.yaml
@@ -51,6 +51,12 @@
         emptyDir: {}
       serviceAccountName: kubernetes-dashboard
       # Comment the following tolerations if Dashboard must not be deployed on master
+      {%- if salt['pillar.get']('kubernetes').get('master', {}).get('network', {}).get('opencontrail', {}).get('enabled', false) %}
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/node
+      {%- else %}
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      {%- endif %}
diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml b/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
index efcd2c1..f7e3857 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-agent.yml
@@ -18,9 +18,15 @@
         cni: {{ common.addons.netchecker.cni }}
 {%- endif %}
     spec:
+      {%- if salt['pillar.get']('kubernetes').get('master', {}).get('network', {}).get('opencontrail', {}).get('enabled', false) %}
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/node
+      {%- else %}
       tolerations:
         - key: node-role.kubernetes.io/master
           effect: NoSchedule
+      {%- endif %}
       containers:
         - name: netchecker-agent
           image: {{ common.addons.netchecker.agent_image }}
diff --git a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
index 7106d1a..f4d28de 100644
--- a/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
+++ b/kubernetes/files/kube-addons/netchecker/netchecker-server.yml
@@ -23,9 +23,15 @@
 {%- endif %}
     spec:
       serviceAccountName: netchecker
+      {%- if salt['pillar.get']('kubernetes').get('master', {}).get('network', {}).get('opencontrail', {}).get('enabled', false) %}
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/node
+      {%- else %}
       tolerations:
         - key: node-role.kubernetes.io/master
           effect: NoSchedule
+      {%- endif %}
       containers:
         - name: netchecker-server
           image: {{ common.addons.netchecker.server_image }}
diff --git a/kubernetes/files/opencontrail/4.0/contrail-kubernetes.conf b/kubernetes/files/opencontrail/4.0/contrail-kubernetes.conf
index aa8233a..b5c66ea 100644
--- a/kubernetes/files/opencontrail/4.0/contrail-kubernetes.conf
+++ b/kubernetes/files/opencontrail/4.0/contrail-kubernetes.conf
@@ -3,7 +3,7 @@
 kubernetes_api_server={{ master.apiserver.insecure_address }}
 kubernetes_api_port={{ master.apiserver.insecure_port }}
 kubernetes_api_secure_port={{ master.apiserver.secure_port }}
-service_subnets={{ master.network.opencontrail.get('service_subnets', '10.96.0.0/12') }}
+service_subnets={{ master.get('service_addresses', '10.96.0.0/12') }}
 pod_subnets={{ master.network.opencontrail.get('pod_subnets', '10.32.0.0/12') }}
 cluster_name={{ master.network.opencontrail.get('cluster_name', 'default') }}
 cluster_project={{ master.network.opencontrail.get('cluster_project', '{}') }}
@@ -17,7 +17,7 @@
 vnc_endpoint_ip = {{ master.network.opencontrail.config.api.host }}
 vnc_endpoint_port = {{ master.network.opencontrail.config.api.get('port', 8082) }}
 admin_user = {{ master.network.opencontrail.identity.get('auth_user', 'admin') }}
-admin_password = {{ master.network.opencontrail.identity.get('auth_password', 'admin') }}
+admin_password = {{ master.network.opencontrail.identity.get('auth_password', 'contrail123') }}
 admin_tenant = {{ master.network.opencontrail.identity.get('auth_tenant', 'admin') }}
 rabbit_server={{ master.network.opencontrail.message_queue.host }}
 rabbit_port={{ master.network.opencontrail.message_queue.get('port', 5672) }}