diff --git "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
index 2f3725c..5d4ebed 100644
--- "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
@@ -31,9 +31,10 @@
 
 
 platforms:
-  - name: ubuntu-14.04
-  - name: ubuntu-16.04
-  - name: centos-7.1
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+    driver_config:
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      platform: ubuntu
 
 
 verifier:
diff --git "a/\173\173cookiecutter.service_name\175\175/.travis.yml" "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
index bd09d8d..1512be1 100644
--- "a/\173\173cookiecutter.service_name\175\175/.travis.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
@@ -8,10 +8,8 @@
     - apt-transport-https
 
 install:
-  - git fetch --unshallow --tags
   - pip install PyYAML
   - pip install virtualenv
-  - pip install reno
   - |
     test -e Gemfile || cat <<EOF > Gemfile
     source 'https://rubygems.org'
@@ -24,8 +22,9 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:xenial
-    - PLATFORM=trevorj/salty-whales:bionic
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7
 
 before_script:
   - set -o pipefail