diff --git a/.kitchen.yml b/.kitchen.yml
index 40d0d57..1d34f62 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,20 +17,16 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
     - name: apache
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-apache
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
   state_top:
     base:
       "*":
         - linux.system
         - aodh
   pillars:
-    release.sls:
-      aodh:
-        server:
-          version: <%= ENV['OS_VERSION'] || 'pike' %>
     ssl.sls:
       aodh:
         server:
@@ -71,36 +67,80 @@
           - linux_repo_openstack
           - aodh
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &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'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-20177
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
 
-  - name: server_cluster
+  - name: server_cluster_ocata
     provisioner:
+      pillars:
+        release.sls:
+          aodh:
+            server:
+              version: ocata
       pillars-from-files:
         aodh.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
 
-  - name: server_single
+  - name: server_cluster_pike
     provisioner:
+      pillars:
+        release.sls:
+          aodh:
+            server:
+              version: pike
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+
+  - name: server_single_ocata
+    provisioner:
+      pillars:
+        release.sls:
+          aodh:
+            server:
+              version: ocata
       pillars-from-files:
         aodh.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
 
-  - name: server_cluster_ssl
+  - name: server_single_pike
     provisioner:
-      pillars-from-files:
-        aodh.sls: tests/pillar/server_cluster.sls
       pillars:
+        release.sls:
+          aodh:
+            server:
+              version: pike
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+
+
+  - name: server_cluster_ssl_pike
+    provisioner:
+      pillars:
+        release.sls:
+          aodh:
+            server:
+              version: pike
         top.sls:
           base:
             "*":
@@ -108,12 +148,17 @@
               - aodh
               - release
               - ssl
-
-  - name: server_single_ssl
-    provisioner:
       pillars-from-files:
-        aodh.sls: tests/pillar/server_single.sls
+        aodh.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+
+  - name: server_single_ssl_pike
+    provisioner:
       pillars:
+        release.sls:
+          aodh:
+            server:
+              version: pike
         top.sls:
           base:
             "*":
@@ -121,5 +166,8 @@
               - aodh
               - release
               - ssl
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ba35803..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-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=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=server-single-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=ocata SUITE=server-cluster-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=ocata SUITE=server-single-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=server-single
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=server-cluster-ssl
-  - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=server-single-ssl
-
-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
diff --git a/README.rst b/README.rst
index 23012c6..713026d 100644
--- a/README.rst
+++ b/README.rst
@@ -183,36 +183,3 @@
 
 * https://docs.openstack.org/cli-reference/aodh.html
 * https://docs.openstack.org/developer/aodh/
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
-    http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
-
-    https://github.com/salt-formulas/salt-formula-aodh/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
-    https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
-    https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
-    https://github.com/salt-formulas/salt-formula-aodh
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
-    #salt-formulas @ irc.freenode.net
diff --git a/metadata.yml b/metadata.yml
index e71002b..f3cfd52 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,6 +1,8 @@
 name: "aodh"
 version: "2016.4.1"
-source: "https://github.com/tcpcloud/salt-formula-aodh"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/aodh"
 dependencies:
   - name: apache
-    source: "https://github.com/salt-formulas/salt-formula-apache"
+    source: "https://gerrit.mcp.mirantis.com/salt-formulas/apache"
+  - name: linux
+    source: "https://gerrit.mcp.mirantis.com/salt-formulas/linux"
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_mitaka.sls b/tests/pillar/repo_mcp_openstack_mitaka.sls
deleted file mode 100644
index ea24305..0000000
--- a/tests/pillar/repo_mcp_openstack_mitaka.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_hotfix:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-hotfix'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_security:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-security'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_updates:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-uptades'
-          priority: 1050
-          package: '*'
-      mirantis_openstack_holdback:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
-        pin:
-        - pin: 'release a=mitaka-holdback'
-          priority: 1050
-          package: '*'