diff --git a/.kitchen.yml b/.kitchen.yml
index 6bc9957..57d452e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -59,9 +59,9 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index e1e6fa9..00108fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,18 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.6 GALERA_VER=3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster  MYSQL_VER=5.7 GALERA_VER=3
 
 before_script:
   - set -o pipefail