diff --git a/.kitchen.yml b/.kitchen.yml
index cfb7f2a..b657514 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -35,7 +35,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:
diff --git a/.travis.yml b/.travis.yml
index fee457f..1bdd382 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,26 +17,41 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=horizon-no-ssl
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=horizon-with-ssl
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=proxy
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=proxy-rate-limit
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=redirect
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=static
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=stats
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=horizon-no-ssl
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=horizon-with-ssl
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=proxy
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=proxy-rate-limit
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=redirect
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=static
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=stats
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=horizon-no-ssl
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=horizon-with-ssl
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=proxy
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=redirect
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=static
-    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=stats
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=horizon-no-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=horizon-with-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=proxy
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=proxy-rate-limit
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=redirect
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=static
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=stats
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=horizon-no-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=horizon-with-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=proxy
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=proxy-rate-limit
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=redirect
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=static
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=stats
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=horizon-no-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=horizon-with-ssl
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=proxy
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=proxy-rate-limit
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=redirect
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=static
+    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=stats
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=horizon-no-ssl
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=horizon-with-ssl
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=proxy
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=proxy-rate-limit
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=redirect
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=static
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=stats
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=horizon-no-ssl
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=horizon-with-ssl
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=proxy
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=proxy-rate-limit
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=redirect
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=static
+    # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=stats
 
 before_script:
   - set -o pipefail