diff --git a/.kitchen.yml b/.kitchen.yml
index d5782ac..36ec5b8 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
+  salt_version: latest
   require_chef: false
   log_level: error
   formula: designate
@@ -17,20 +17,16 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
     - name: oslo_templates
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-oslo-templates
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
   state_top:
     base:
       "*":
         - linux
         - designate
   pillars:
-    release.sls:
-      designate:
-        server:
-          version: <%= ENV['OS_VERSION'] || 'pike' %>
     ssl.sls:
       designate:
         server:
@@ -77,41 +73,88 @@
           - linux_repo_openstack
           - designate
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+
 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
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-
-  - name: server_cluster
+  - name: server_cluster_ocata
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: ocata
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+        - tests/integration/ocata/server_cluster
 
-  - name: server_single
+  - name: server_single_ocata
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: ocata
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+        - tests/integration/ocata/server_single
+
+  - name: server_cluster_pike
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: pike
+    verifier:
+      inspec_tests:
+        - tests/integration/pike/server_cluster
+
+  - name: server_single_pike
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: pike
+    verifier:
+      inspec_tests:
+        - tests/integration/pike/server_single
 
   - name: server_cluster_ssl
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
       pillars:
         top.sls:
           base:
@@ -120,9 +163,13 @@
               - designate
               - release
               - ssl
+        release.sls:
+          designate:
+            server:
+              version: pike
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_cluster
+        - tests/integration/pike/server_cluster
       attributes:
         ssl: true
 
@@ -130,6 +177,7 @@
     provisioner:
       pillars-from-files:
         designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
       pillars:
         top.sls:
           base:
@@ -138,10 +186,87 @@
               - designate
               - release
               - ssl
+        release.sls:
+          designate:
+            server:
+              version: pike
     verifier:
       inspec_tests:
-        - tests/integration/<%= ENV['OS_VERSION'] || 'pike'%>/server_single
+        - tests/integration/pike/server_single
       attributes:
         ssl: true
 
+  - name: server_cluster_queens
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_queens.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: queens
+    verifier:
+      inspec_tests:
+        - tests/integration/queens/server_cluster
+
+  - name: server_single_queens
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_queens.sls
+      pillars:
+        release.sls:
+          designate:
+            server:
+              version: queens
+    verifier:
+      inspec_tests:
+        - tests/integration/queens/server_single
+
+  - name: server_cluster_ssl
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_queens.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - designate
+              - release
+              - ssl
+        release.sls:
+          designate:
+            server:
+              version: queens
+    verifier:
+      inspec_tests:
+        - tests/integration/queens/server_cluster
+      attributes:
+        ssl: true
+
+  - name: server_single_ssl
+    provisioner:
+      pillars-from-files:
+        designate.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_queens.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_openstack
+              - designate
+              - release
+              - ssl
+        release.sls:
+          designate:
+            server:
+              version: queens
+    verifier:
+      inspec_tests:
+        - tests/integration/queens/server_single
+      attributes:
+        ssl: true
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2f5e886..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,47 +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-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-single-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=queens SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=queens SUITE=server-single-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=queens SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=queens SUITE=server-cluster-ssl
-#  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=designate-without-backend
-
-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