diff --git a/.kitchen.yml b/.kitchen.yml
index bffe40c..bbe9f19 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -36,9 +36,9 @@
 
 
 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 1d5f1c0..4e6b419 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,21 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=replication-both MYSQL_VER=5.5
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=replication-both MYSQL_VER=5.7
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=replication-master MYSQL_VER=5.5
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=replication-master MYSQL_VER=5.7
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=replication-slave MYSQL_VER=5.5
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=replication-slave MYSQL_VER=5.7
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=server-client-database MYSQL_VER=5.5
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-client-database MYSQL_VER=5.7
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=server-client-user MYSQL_VER=5.5
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-client-user MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=replication-both MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=replication-master MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=replication-slave MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-client-database MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-client-user MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=replication-both MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=replication-master MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=replication-slave MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-client-database MYSQL_VER=5.7
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-client-user MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=replication-both MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=replication-master MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=replication-slave MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-client-database MYSQL_VER=5.7
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-client-user MYSQL_VER=5.7
 
 before_script:
   - set -o pipefail