diff --git a/.kitchen.yml b/.kitchen.yml
index 9ef697b..a7be114 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,10 +17,10 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
     - name: salt
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-salt.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/salt.git
   state_top:
     base:
       "*":
@@ -39,15 +39,28 @@
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: xenial-2016.3
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: *xenial-20163
+      platform: ubuntu
+
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-
   - name: agent
     provisioner:
       pillars-from-files:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 47be1ae..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-install:
-  - git fetch --unshallow --tags
-  - pip install PyYAML
-  - pip install virtualenv
-  - pip install reno
-  - |
-    test -e Gemfile || cat <<EOF > Gemfile
-    source 'https://rubygems.org'
-    gem 'rake'
-    gem 'test-kitchen'
-    gem 'kitchen-docker'
-    gem 'kitchen-inspec'
-    gem 'inspec', '<3.0.0'
-    #Version was frozen, because of issues in the version of inspec >3.0.0 -- see https://mirantis.jira.com/browse/PROD-24324 for more info
-    gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
-  - bundle install
-
-env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-  - reno lint $PWD | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -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
diff --git a/fluentd/agent.sls b/fluentd/agent.sls
index 6f64df4..78719f0 100644
--- a/fluentd/agent.sls
+++ b/fluentd/agent.sls
@@ -61,7 +61,7 @@
     - require:
       - pkg: fluentd_packages_agent
     - context:
-      fluentd_agent: {{ fluentd_agent }}
+      fluentd_agent: {{ fluentd_agent | yaml }}
 
 {%- else %}
 
@@ -76,7 +76,7 @@
     - require:
       - pkg: fluentd_packages_agent
     - context:
-      fluentd_agent: {{ fluentd_agent }}
+      fluentd_agent: {{ fluentd_agent | yaml }}
 
 {%- endif %}
 
@@ -91,7 +91,7 @@
     - require:
       - pkg: fluentd_packages_agent
     - context:
-      fluentd_agent: {{ fluentd_agent }}
+      fluentd_agent: {{ fluentd_agent | yaml }}
 
 fluentd_grok_pattern_agent:
   file.managed:
@@ -106,7 +106,7 @@
     - require_in:
       - file: fluentd_config_d_dir_clean
     - context:
-      fluentd_agent: {{ fluentd_agent }}
+      fluentd_agent: {{ fluentd_agent | yaml }}
 
 {%- set fluentd_config = fluentd_agent.get('config', {}) %}
 {%- for name,values in fluentd_config.get('input', {}).iteritems() %}