diff --git a/kubernetes/files/kube-addons/contrail/contrail.yaml b/kubernetes/files/kube-addons/contrail/contrail.yaml
index c122e07..ac7bcf1 100644
--- a/kubernetes/files/kube-addons/contrail/contrail.yaml
+++ b/kubernetes/files/kube-addons/contrail/contrail.yaml
@@ -48,7 +48,7 @@
           value: {{ common.addons.get('contrail',{}).get('rabbitmq_erlang_cookie',"YTQMGYEHFATZPDKPOCXX") }}
 
       - name: opencontrail-controller
-        image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:{{ common.addons.get('contrail',{}).get('contrail_version',"latest") }}
+        image: {{ common.addons.opencontrail.controller.image }}
         securityContext:
           privileged: true
         env:
@@ -98,7 +98,7 @@
 
 
       - name: opencontrail-analyticsdb
-        image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:{{ common.addons.get('contrail',{}).get('contrail_version',"latest") }}
+        image: {{ common.addons.opencontrail.analyticsdb.image }}
         securityContext:
           privileged: true
         env:
@@ -139,7 +139,7 @@
           mountPath: /var/log/journal
 
       - name: opencontrail-analytics
-        image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:{{ common.addons.get('contrail',{}).get('contrail_version',"latest") }}
+        image: {{ common.addons.opencontrail.analytics.image }}
         volumeMounts:
         - name: etc-contrail
           mountPath: /etc/contrail
diff --git a/kubernetes/files/kube-addons/contrail/kube-manager.yaml b/kubernetes/files/kube-addons/contrail/kube-manager.yaml
index f751a57..2775380 100644
--- a/kubernetes/files/kube-addons/contrail/kube-manager.yaml
+++ b/kubernetes/files/kube-addons/contrail/kube-manager.yaml
@@ -20,7 +20,7 @@
       hostNetwork: true
       containers:
       - name: opencontrail-kube-manager
-        image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:{{ common.addons.get('contrail',{}).get('contrail_version',"latest") }}
+        image: {{ common.addons.opencontrail.kube_manager.image }}
         securityContext:
           privileged: true
         env:
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index 6f53745..877a6a1 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -49,6 +49,15 @@
           enabled: False
           namespace: kube-system
           image: yashulyak/contrail-controller:latest
+        opencontrail:
+          controller:
+            image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:latest
+          analyticsdb:
+            image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:latest
+          analytics:
+            image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:latest
+          kube_manager:
+            image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:latest
         coredns:
           enabled: False
           namespace: kube-system
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index d506d2f..ced09cb 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -38,6 +38,15 @@
         enabled: true
         namespace: kube-system
         image: yashulyak/contrail-controller:latest
+      opencontrail:
+        controller:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:latest
+        analyticsdb:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:latest
+        analytics:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:latest
+        kube_manager:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:latest
     monitoring:
       backend: prometheus
   master:
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index 60b6cb0..3c5997d 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -34,6 +34,15 @@
         enabled: true
         namespace: kube-system
         image: mirantis/virtlet:v1.0.3
+      opencontrail:
+        controller:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-controller:latest
+        analyticsdb:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analyticsdb:latest
+        analytics:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-analytics:latest
+        kube_manager:
+          image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager:latest
     monitoring:
       backend: prometheus
   master: