diff --git a/.kitchen.yml b/.kitchen.yml
index fd43c81..bbac440 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,9 +30,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 9ae65fa..cf42815 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,15 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=network
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=network
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=pool
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=pool
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=simple
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=simple
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=pool
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=simple
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=network
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=pool
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=simple
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=network
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=pool
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=simple
 
 before_script:
   - set -o pipefail