diff --git a/kitchen-init.sh b/kitchen-init.sh
index e1ef27e..2d66184 100755
--- a/kitchen-init.sh
+++ b/kitchen-init.sh
@@ -73,11 +73,11 @@
     envtpl < <(curl -skL  "${SOURCE_REPO_URI}/.kitchen.openstack.yml" -- | sed 's/cookiecutter\.kitchen_//g') > .kitchen.openstack.yml
 }
 
-# .TRAVIS.YML
-###################################
+# # .TRAVIS.YML
+# ###################################
 
-test -e .travis.yml || \
-  curl -skL  "${SOURCE_REPO_URI}/.travis.yml" -o .travis.yml
+# test -e .travis.yml || \
+#   curl -skL  "${SOURCE_REPO_URI}/.travis.yml" -o .travis.yml
 
 # OTHER metadata if formula was not generated by up-to-date cookiecutter-salt-formula
 #####################################################################################
@@ -97,7 +97,7 @@
 
 git add \
   .gitignore \
-  .kitchen.yml \
-  .travis.yml
+  .kitchen.yml
+  # .travis.yml
 
 git status
diff --git "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml" "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
index 703312e..8495bd9 100644
--- "a/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.kitchen.docker.yml"
@@ -5,8 +5,6 @@
   #socket: tcp://127.0.0.1:2376
   use_sudo: false
 
-
-
 provisioner:
   name: salt_solo
   salt_install: bootstrap
@@ -29,32 +27,34 @@
 
 {%- if cookiecutter.kitchen_driver =='docker' %}
 
-
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-stable
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
+      image: docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19
       platform: ubuntu
 
+  - name: xenial-2017.7
+    driver_config:
+      image: docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19
+      platform: ubuntu
 
 verifier:
   name: {{ cookiecutter.kitchen_verifier }}
   sudo: true
 
-
 suites:
   {%- if cookiecutter.kitchen_suites == "" %}
-  - name: default
-  #  provisioner:
-  #    pillars-from-files:
-  #      {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/default.sls
+  - name: {{ cookiecutter.role_name }}-single
+    provisioner:
+      pillars-from-files:
+        {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{ cookiecutter.role_name }}_single.sls
   {%- else %}
   {%- for suite in cookiecutter.kitchen_suites.split() %}
 
   - name: {{ suite }}
     provisioner:
       pillars-from-files:
-        {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{suite}}.sls
+        {{ cookiecutter.kitchen_formula }}.sls: tests/pillar/{{ suite }}.sls
   {%- endfor %}
   {%- endif %}
 
diff --git "a/\173\173cookiecutter.service_name\175\175/.travis.yml" "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
deleted file mode 100644
index 8cbb983..0000000
--- "a/\173\173cookiecutter.service_name\175\175/.travis.yml"
+++ /dev/null
@@ -1,45 +0,0 @@
-sudo: required
-services:
-  - docker
-
-addons:
-  apt:
-    packages:
-    - apt-transport-https
-
-install:
-  - pip install PyYAML
-  - pip install virtualenv
-  - |
-    if [ ! -e Gemfile ]; then
-      curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
-    fi
-  - bundle install
-
-env:
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable
-    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7
-    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-stable
-    - PLATFORM=epcim/salt:saltstack-centos-7-salt-2017.7
-    - PLATFORM=epcim/salt:saltstack-centos-7-salt-stable
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6123573504759330786b
-    on_success: change # options: [always|never|change] default: always
-    on_failure: never  # options: [always|never|change] default: always
-    on_start: never    # options: [always|never|change] default: always
-    on_cancel: never   # options: [always|never|change] default: always
-    on_error: never    # options: [always|never|change] default: always
-  email: false