diff --git a/.kitchen.yml b/.kitchen.yml
index f504ce2..63c57d4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,7 +17,8 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -27,7 +28,6 @@
     top.sls:
       base:
         "*":
-          - linux_repo_openstack
           - linux_repo_opencontrail
           - linux_repo_cassandra
           - linux
@@ -41,99 +41,59 @@
     opencontrail_juniper.sls: {}
   pillars-from-files:
     linux_repo_cassandra.sls: tests/pillar/repo_cassandra.sls
-    linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_<%= ENV['OC_REPO'] || 'oc311' %>.sls
-    linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
+
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
       platform: ubuntu
 
 suites:
-
-  - name: single3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/single3.sls
-  - name: single40
+  - name: single_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/single40.sls
+        opencontrail.sls: tests/pillar/single.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: analytics3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics3.sls
-  - name: analytics40
+  - name: analytics_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics40.sls
+        opencontrail.sls: tests/pillar/analytics.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: control3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/control3.sls
-  - name: control40
+  - name: control_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/control40.sls
+        opencontrail.sls: tests/pillar/control.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: cluster3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster3.sls
-  - name: cluster40
+  - name: cluster_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster40.sls
+        opencontrail.sls: tests/pillar/cluster.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  # - name: tor3
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor3.sls
-  # - name: tor40
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor40.sls
-  #       linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-
-  - name: vrouter3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter3.sls
-  - name: vrouter40
+  - name: vrouter_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter40.sls
+        opencontrail.sls: tests/pillar/vrouter.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 32abc3c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-install:
-  - pip install PyYAML
-  - pip install virtualenv
-  - |
-    if [ ! -e Gemfile ]; then
-       curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
-    fi
-  - bundle install
-
-env:
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc311 SUITE=single3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc311 SUITE=analytics3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc311 SUITE=control3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc311 SUITE=cluster3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc311 SUITE=vrouter3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc323 SUITE=single3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc323 SUITE=analytics3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc323 SUITE=control3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2016.3/salt:2018_11_19 OC_REPO=oc323 SUITE=cluster3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc323 SUITE=vrouter3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc40 SUITE=single40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc40 SUITE=analytics40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc40 SUITE=control40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc40 SUITE=cluster40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 OC_REPO=oc40 SUITE=vrouter40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc311 SUITE=single3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc311 SUITE=analytics3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc311 SUITE=control3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc311 SUITE=cluster3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc311 SUITE=vrouter3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc323 SUITE=single3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc323 SUITE=analytics3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc323 SUITE=control3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19 OC_REPO=oc323 SUITE=cluster3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc323 SUITE=vrouter3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc40 SUITE=single40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc40 SUITE=analytics40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc40 SUITE=control40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc40 SUITE=cluster40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OC_REPO=oc40 SUITE=vrouter40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-stable/salt:2018_11_19 OC_REPO=oc323 SUITE=single3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-stable/salt:2018_11_19 OC_REPO=oc323 SUITE=analytics3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-stable/salt:2018_11_19 OC_REPO=oc323 SUITE=control3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-stable/salt:2018_11_19 OC_REPO=oc323 SUITE=cluster3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc323 SUITE=vrouter3
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc40 SUITE=single40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc40 SUITE=analytics40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc40 SUITE=control40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc40 SUITE=cluster40
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OC_REPO=oc40 SUITE=vrouter40
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6123573504759330786b
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: never  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-    on_cancel: never    # options: [always|never|change] default: always
-    on_error: never    # options: [always|never|change] default: always
-  email: false
diff --git a/tests/pillar/analytics40.sls b/tests/pillar/analytics.sls
similarity index 96%
rename from tests/pillar/analytics40.sls
rename to tests/pillar/analytics.sls
index 047e59e..34bb7d2 100644
--- a/tests/pillar/analytics40.sls
+++ b/tests/pillar/analytics.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 4.0
+    version: 4.1
     config_only: true
     identity:
       engine: keystone
@@ -25,7 +25,7 @@
       password: password
       token: token
       tenant: admin
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     bind:
@@ -58,7 +58,7 @@
       - host: 127.0.0.1
       - host: 127.0.0.1
   database:
-    version: 4.0
+    version: 4.1
     config_only: true
     cassandra:
       version: 2
diff --git a/tests/pillar/analytics3.sls b/tests/pillar/analytics3.sls
deleted file mode 100644
index 13713f2..0000000
--- a/tests/pillar/analytics3.sls
+++ /dev/null
@@ -1,65 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  collector:
-    version: 3.0
-    enabled: true
-    bind:
-      address: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    discovery:
-      host: 127.0.0.1
-    data_ttl: 1
-    alarm_gen:
-      workers: 1
-      port_prefix: 59
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-    message_queue:
-      host: 127.0.0.1
-      members:
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-  database:
-    version: 3.0
-    cassandra:
-      version: 2
-    enabled: true
-    name: 'Contrail'
-    minimum_disk: 10
-    original_token: 0
-    data_dirs:
-    - /var/lib/cassandra
-    id: 1
-    discovery:
-      host: 127.0.0.1
-    bind:
-      host: 127.0.0.1
-      port: 9042
-      rpc_port: 9160
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
diff --git a/tests/pillar/cluster40.sls b/tests/pillar/cluster.sls
similarity index 97%
rename from tests/pillar/cluster40.sls
rename to tests/pillar/cluster.sls
index 1de436b..ee2346b 100644
--- a/tests/pillar/cluster40.sls
+++ b/tests/pillar/cluster.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 4.0
+    version: 4.1
     config_only: true
     identity:
       engine: keystone
@@ -14,7 +14,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     api:
@@ -70,7 +70,7 @@
     - host: 127.0.0.1
       id: 3
   control:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     name: ntw-01
@@ -112,7 +112,7 @@
       password: password
       token: token
       tenant: admin
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     bind:
@@ -145,7 +145,7 @@
       - host: 127.0.0.1
       - host: 127.0.0.1
   database:
-    version: 4.0
+    version: 4.1
     config_only: true
     cassandra:
       version: 2
@@ -173,7 +173,7 @@
       - host: 127.0.0.1
       - host: 127.0.0.1
   web:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: True
     network:
diff --git a/tests/pillar/cluster3.sls b/tests/pillar/cluster3.sls
deleted file mode 100644
index a23557c..0000000
--- a/tests/pillar/cluster3.sls
+++ /dev/null
@@ -1,171 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  config:
-    version: 3.0
-    enabled: true
-    multi_tenancy: false
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-    discovery:
-      host: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    message_queue:
-      engine: rabbitmq
-      host: 127.0.0.1
-      port: 5672
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-    cache:
-      members:
-      - host: 127.0.0.1
-        port: 11211
-      - host: 127.0.0.1
-        port: 11211
-      - host: 127.0.0.1
-        port: 11211
-    identity:
-      engine: keystone
-      version: '2.0'
-      region: RegionOne
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-  control:
-    version: 3.0
-    enabled: true
-    name: ntw-01
-    bind:
-      address: 127.0.0.1
-    dns:
-      forwarders:
-      - 8.8.8.8
-      - 8.8.4.4
-    discovery:
-      host: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-  collector:
-    version: 3.0
-    enabled: true
-    bind:
-      address: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    discovery:
-      host: 127.0.0.1
-    data_ttl: 1
-    alarm_gen:
-      workers: 1
-      port_prefix: 59
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-    message_queue:
-      host: 127.0.0.1
-      members:
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-  database:
-    version: 3.0
-    cassandra:
-      version: 2
-    enabled: true
-    name: 'Contrail'
-    minimum_disk: 10
-    original_token: 0
-    data_dirs:
-    - /var/lib/cassandra
-    id: 1
-    discovery:
-      host: 127.0.0.1
-    bind:
-      host: 127.0.0.1
-      port: 9042
-      rpc_port: 9160
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-    concurrent_compactors: 1
-  web:
-    version: 3.0
-    enabled: True
-    network:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    cache:
-      engine: redis
-      host: 127.0.0.1
-      port: 6379
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-    identity:
-      engine: keystone
-      version: '2.0'
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
diff --git a/tests/pillar/control40.sls b/tests/pillar/control.sls
similarity index 97%
rename from tests/pillar/control40.sls
rename to tests/pillar/control.sls
index 51a3b35..ba962c0 100644
--- a/tests/pillar/control40.sls
+++ b/tests/pillar/control.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 4.0
+    version: 4.1
     config_only: true
     identity:
       engine: keystone
@@ -14,7 +14,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     api:
@@ -71,7 +71,7 @@
       id: 3
     list_optimization_enabled: true
   control:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: true
     name: ntw-01
@@ -110,7 +110,7 @@
         key_file: /etc/contrail/privkey.pem
         ca_cert_file: /etc/contrail/ca-cert.pem
   database:
-    version: 4.0
+    version: 4.1
     config_only: true
     cassandra:
       version: 2
@@ -138,7 +138,7 @@
       - host: 127.0.0.1
       - host: 127.0.0.1
   web:
-    version: 4.0
+    version: 4.1
     config_only: true
     enabled: True
     network:
diff --git a/tests/pillar/control3.sls b/tests/pillar/control3.sls
deleted file mode 100644
index d2c9f4e..0000000
--- a/tests/pillar/control3.sls
+++ /dev/null
@@ -1,156 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  config:
-    version: 3.0
-    enabled: true
-    multi_tenancy: false
-    aaa_mode: rbac
-    global_read_only_role: demo
-    api_workers: 3
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-    discovery:
-      host: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    message_queue:
-      engine: rabbitmq
-      host: 127.0.0.1
-      port: 5672
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-      - host: 127.0.0.1
-        port: 9160
-    cache:
-      members:
-      - host: 127.0.0.1
-        port: 11211
-      - host: 127.0.0.1
-        port: 11211
-      - host: 127.0.0.1
-        port: 11211
-    identity:
-      engine: keystone
-      version: '2.0'
-      region: RegionOne
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-    list_optimization_enabled: true
-    rootlogger: "INFO, CONSOLE"
-  control:
-    version: 3.0
-    enabled: true
-    name: ntw-01
-    bind:
-      address: 127.0.0.1
-    dns:
-      forwarders:
-      - 8.8.8.8
-      - 8.8.4.4
-    discovery:
-      host: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-    xmpp:
-      tls:
-        enabled: True
-        auth:
-          enabled: True
-        cert_file: /etc/contrail/server.pem
-        key_file: /etc/contrail/privkey.pem
-        ca_cert_file: /etc/contrail/ca-cert.pem
-  database:
-    version: 3.0
-    cassandra:
-      version: 2
-    enabled: true
-    name: 'Contrail'
-    minimum_disk: 10
-    original_token: 0
-    data_dirs:
-    - /var/lib/cassandra
-    id: 1
-    discovery:
-      host: 127.0.0.1
-    bind:
-      host: 127.0.0.1
-      port: 9042
-      rpc_port: 9160
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-  web:
-    version: 3.0
-    enabled: True
-    network:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    cache:
-      engine: redis
-      host: 127.0.0.1
-      port: 6379
-    members:
-    - host: 127.0.0.1
-      id: 1
-    - host: 127.0.0.1
-      id: 2
-    - host: 127.0.0.1
-      id: 3
-    identity:
-      engine: keystone
-      version: '2.0'
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
diff --git a/tests/pillar/repo_opencontrail_oc311.sls b/tests/pillar/repo_opencontrail_oc311.sls
deleted file mode 100644
index 8f2f75e..0000000
--- a/tests/pillar/repo_opencontrail_oc311.sls
+++ /dev/null
@@ -1,19 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mcp_opencontrail_repo:
-        source: "deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/ nightly oc311 extra"
-        architectures: amd64
-        key_url: "http://apt.mirantis.com/public.gpg"
-        pin:
-        - pin: 'release a=nightly'
-          priority: 1100
-          package: '*'
-    package:
-      librdkafka1:
-        version: 0.9.0-0contrail0
-        hold: true
-      python-kafka:
-        version: 1.0.1-0contrail1
-        hold: true
diff --git a/tests/pillar/repo_opencontrail_oc323.sls b/tests/pillar/repo_opencontrail_oc323.sls
deleted file mode 100644
index 1fb4c4c..0000000
--- a/tests/pillar/repo_opencontrail_oc323.sls
+++ /dev/null
@@ -1,19 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mcp_opencontrail_repo:
-        source: "deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/ nightly oc323 extra"
-        architectures: amd64
-        key_url: "http://apt.mirantis.com/public.gpg"
-        pin:
-        - pin: 'release a=nightly'
-          priority: 1100
-          package: '*'
-    package:
-      librdkafka1:
-        version: 0.9.0-0contrail0
-        hold: true
-      python-kafka:
-        version: 1.0.1-0contrail1
-        hold: true
diff --git a/tests/pillar/repo_opencontrail_oc41.sls b/tests/pillar/repo_opencontrail_oc41.sls
index 5c57e46..57f885f 100644
--- a/tests/pillar/repo_opencontrail_oc41.sls
+++ b/tests/pillar/repo_opencontrail_oc41.sls
@@ -3,14 +3,15 @@
     enabled: true
     repo:
       mcp_opencontrail_repo:
-        source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        source: "deb [arch=amd64] http://mirror.mirantis.com/update/2019.2.0/opencontrail-4.1/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }}/archive-opencontrail-4.1.key"
-        pin:
-        - pin: 'release a=nightly'
-          priority: 1100
-          package: '*'
+        key_url: "http://mirror.mirantis.com/update/2019.2.0/opencontrail-4.1/{{ grains.get('oscodename') }}/archive-opencontrail-4.1.key"
       mcp_extra_repo:
+        source: "deb [arch=amd64] http://mirror.mirantis.com/update/2019.2.0/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/update/2019.2.0/extra/{{ grains.get('oscodename') }}/archive-extra.key"
+      # OC containers are build from nightly
+      mcp_extra_repo_nightly:
         source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
         key_url: "http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }}/archive-extra.key"
@@ -18,11 +19,11 @@
         - pin: 'release a=nightly'
           priority: 1100
           package: '*'
-      mcp_openstack_ocata:
-        source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+      mcp_openstack_queens:
+        source: "deb [arch=amd64] http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }}/archive-ocata.key"
+        key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
         pin:
-        - pin: 'release a=ocata'
+        - pin: 'release l=queens'
           priority: 1100
           package: '*'
diff --git a/tests/pillar/repo_openstack.sls b/tests/pillar/repo_openstack.sls
deleted file mode 100644
index 17da338..0000000
--- a/tests/pillar/repo_openstack.sls
+++ /dev/null
@@ -1,54 +0,0 @@
-parameters:
-  _param:
-    apt_mk_version: stable
-  linux:
-    system:
-      repo:
-        mirantis_openstack:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-          pin:
-          - pin: 'release a=mitaka'
-            priority: 1100
-            package: '*'
-        mirantis_openstack_hotfix:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-          pin:
-          - pin: 'release a=mitaka-hotfix'
-            priority: 1100
-            package: '*'
-        mirantis_openstack_security:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-          pin:
-          - pin: 'release a=mitaka-security'
-            priority: 1100
-            package: '*'
-        mirantis_openstack_updates:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-          pin:
-          - pin: 'release a=mitaka-uptades'
-            priority: 1100
-            package: '*'
-        mirantis_openstack_holdback:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-          pin:
-          - pin: 'release a=mitaka-holdback'
-            priority: 1100
-            package: '*'
-        mk_openstack:
-          source: "deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/ ${_param:apt_mk_version} mitaka"
-          architectures: amd64
-          key_url: "http://apt.mirantis.com/public.gpg"
-          pin:
-          - pin: 'release a=${_param:apt_mk_version}'
-            priority: 1100
-            package: '*'
diff --git a/tests/pillar/single40.sls b/tests/pillar/single.sls
similarity index 96%
rename from tests/pillar/single40.sls
rename to tests/pillar/single.sls
index ea5acef..09b3282 100644
--- a/tests/pillar/single40.sls
+++ b/tests/pillar/single.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 4.0
+    version: 4.1
     identity:
       protocol: http
       engine: keystone
@@ -13,7 +13,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 4.0
+    version: 4.1
     api:
       host: 127.0.0.1
       use_ssl: False
@@ -57,7 +57,7 @@
       id: 1
   control:
     name: ntw-01
-    version: 4.0
+    version: 4.1
     enabled: true
     config_only: True
     bind:
@@ -88,7 +88,7 @@
       password: password
       token: token
       tenant: admin
-    version: 4.0
+    version: 4.1
     enabled: true
     bind:
       address: 127.0.0.1
@@ -110,7 +110,7 @@
       members:
       - host: 127.0.0.1
   database:
-    version: 4.0
+    version: 4.1
     cassandra:
       version: 2
     enabled: true
@@ -132,7 +132,7 @@
     - host: 127.0.0.1
       id: 1
   web:
-    version: 4.0
+    version: 4.1
     enabled: True
     network:
       host: 127.0.0.1
diff --git a/tests/pillar/single3.sls b/tests/pillar/single3.sls
deleted file mode 100644
index 045eb7a..0000000
--- a/tests/pillar/single3.sls
+++ /dev/null
@@ -1,138 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  config:
-    version: 3.0
-    multi_tenancy: false
-    enabled: true
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-    discovery:
-      host: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    message_queue:
-      engine: rabbitmq
-      host: 127.0.0.1
-      port: 5672
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-    cache:
-      members:
-      - host: 127.0.0.1
-        port: 11211
-    identity:
-      engine: keystone
-      version: '2.0'
-      region: RegionOne
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
-    members:
-    - host: 127.0.0.1
-      id: 1
-  control:
-    name: ntw-01
-    version: 3.0
-    enabled: true
-    bind:
-      address: 127.0.0.1
-    discovery:
-      host: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    members:
-    - host: 127.0.0.1
-      id: 1
-  collector:
-    version: 3.0
-    enabled: true
-    bind:
-      address: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    discovery:
-      host: 127.0.0.1
-    data_ttl: 2
-    alarm_gen:
-      workers: 1
-      port_prefix: 59
-    database:
-      members:
-      - host: 127.0.0.1
-        port: 9160
-    message_queue:
-      host: 127.0.0.1
-      members:
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-      - host: 127.0.0.1
-  database:
-    version: 3.0
-    cassandra:
-      version: 2
-    enabled: true
-    minimum_disk: 10
-    name: 'Contrail'
-    original_token: 0
-    data_dirs:
-    - /var/lib/cassandra
-    id: 1
-    discovery:
-      host: 127.0.0.1
-    bind:
-      host: 127.0.0.1
-      port: 9042
-      rpc_port: 9160
-    members:
-    - host: 127.0.0.1
-      id: 1
-  web:
-    version: 3.0
-    enabled: True
-    network:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    analytics:
-      host: 127.0.0.1
-    master:
-      host: 127.0.0.1
-    cache:
-      engine: redis
-      host: 127.0.0.1
-      port: 6379
-    members:
-    - host: 127.0.0.1
-      id: 1
-    identity:
-      engine: keystone
-      version: '2.0'
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      user: admin
-      password: password
-      token: token
-      tenant: admin
diff --git a/tests/pillar/vrouter-dpdk3.sls b/tests/pillar/vrouter-dpdk3.sls
deleted file mode 100644
index 1ffcd72..0000000
--- a/tests/pillar/vrouter-dpdk3.sls
+++ /dev/null
@@ -1,34 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      protocol: http
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  compute:
-    version: 3.0
-    enabled: True
-    dpdk:
-      enabled: True
-      taskset: "0x0000003C00003C"
-      socket_mem: "1024,1024"
-    discovery:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    interface:
-      mac_address: 90:e2:ba:7c:22:e1
-      pci: 0000:81:00.1
-      address: 127.0.0.1
-      dev: eth0
-      gateway: 127.0.0.1
-      mask: /24
-      dns: 127.0.0.1
-      mtu: 9000
diff --git a/tests/pillar/vrouter40.sls b/tests/pillar/vrouter.sls
similarity index 97%
rename from tests/pillar/vrouter40.sls
rename to tests/pillar/vrouter.sls
index a37c728..9458fcf 100644
--- a/tests/pillar/vrouter40.sls
+++ b/tests/pillar/vrouter.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 4.0
+    version: 4.1
     identity:
       engine: keystone
       protocol: http
@@ -22,7 +22,7 @@
       password: contrail
       tenant: admin
   compute:
-    version: 4.0
+    version: 4.1
     enabled: True
     collector:
       members:
diff --git a/tests/pillar/vrouter3.sls b/tests/pillar/vrouter3.sls
deleted file mode 100644
index fbf2550..0000000
--- a/tests/pillar/vrouter3.sls
+++ /dev/null
@@ -1,58 +0,0 @@
-opencontrail:
-  common:
-    version: 3.0
-    identity:
-      engine: keystone
-      host: 127.0.0.1
-      port: 35357
-      token: token
-      password: password
-    network:
-      engine: neutron
-      host: 127.0.0.1
-      port: 9696
-  compute:
-    version: 3.0
-    enabled: True
-    discovery:
-      host: 127.0.0.1
-    bind:
-      address: 127.0.0.1
-    dns:
-      forwarders:
-      - 8.8.8.8
-      - 8.8.4.4
-    interface:
-      address: 127.0.0.1
-      dev: eth0
-      gateway: 127.0.0.1
-      mask: /24
-      dns: 127.0.0.1
-      mtu: 9000
-    tor:
-      enabled: true
-      bind:
-        port: 8086
-      agent:
-        tor01:
-          id: 0
-          address: 127.0.0.1
-          port: 6632
-          ssl:
-            enabled: True
-    lbaas:
-      enabled: true
-      secret_manager:
-        engine: barbican
-        identity:
-          user: admin
-          password: "supersecretpassword123"
-          tenant: admin
-    xmpp:
-      tls:
-        enabled: True
-        auth:
-          enabled: True
-        cert_file: /etc/contrail/server.pem
-        key_file: /etc/contrail/privkey.pem
-        ca_cert_file: /etc/contrail/ca-cert.pem
\ No newline at end of file