diff --git a/.kitchen.yml b/.kitchen.yml
index a14a20a..4992d02 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -40,9 +40,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 325550a..716836a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,12 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-cluster
-  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-single
-  # Missing Trusty packages for aodh
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-cluster
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-single
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-cluster
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-single
 
 before_script:
   - set -o pipefail