diff --git a/.kitchen.yml b/.kitchen.yml
index c338a04..f494b9b 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 8c8060c..7d9b5c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,15 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=openjdk-7
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=openjdk-8
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=openjdk-9
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=oracle-jdk-8
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=oracle-jdk-9
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openjdk-7
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openjdk-8
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openjdk-9
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=oracle-jdk-8
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=oracle-jdk-9
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openjdk-8
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=openjdk-9
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=oracle-jdk-8
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=oracle-jdk-9
 
 before_script:
   - set -o pipefail