diff --git a/.kitchen.yml b/.kitchen.yml
index 2de4c62..2c481f8 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,9 +29,9 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index 61d7fd6..b20c029 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,12 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-server
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-server
-#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=rabbitmq-ssl-server
-#  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=rabbitmq-ssl-server
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-server
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-server
-#  - PLATFORM=trevorj/salty-whales:trusty SUITE=rabbitmq-ssl-server
-#  - PLATFORM=trevorj/salty-whales:xenial SUITE=rabbitmq-ssl-server
-## Test on both Salt version until there is new test policy accepted
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-server
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-ssl-server
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-server
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-ssl-server
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-server
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-ssl-server
 
 before_script:
   - set -o pipefail