diff --git a/.kitchen.yml b/.kitchen.yml
index b795dac..680d6fc 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 7f0292b..232111e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,21 +17,21 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=class-mapping
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=generate-multi
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=generate-single
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=storage-local
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=storage-nodes-uri
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=class-mapping
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=generate-multi
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=generate-single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=storage-local
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=storage-nodes-uri
-    - PLATFORM=trevorj/salty-whales:bionic SUITE=class_mapping
-    - PLATFORM=trevorj/salty-whales:bionic SUITE=generate_multi
-    - PLATFORM=trevorj/salty-whales:bionic SUITE=generate_single
-    - PLATFORM=trevorj/salty-whales:bionic SUITE=storage_local
-    - PLATFORM=trevorj/salty-whales:bionic SUITE=storage_nodes_uri
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=class-mapping
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=generate-multi
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=generate-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=storage-local
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=storage-nodes-uri
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=class-mapping
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=generate-multi
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=generate-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=storage-local
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=storage-nodes-uri
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=class_mapping
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=generate_multi
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=generate_single
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=storage_local
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=storage_nodes_uri
 
 before_script:
   - set -o pipefail