diff --git a/.gitreview b/.gitreview
index f95ce43..225d6a9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.fuel-infra.org
+host=review.openstack.org
 port=29418
-project=nextgen/ms-openstack-base.git
+project=openstack/fuel-ccp-openstack-base.git
diff --git a/tools/run-check-docker-syntax.sh b/tools/run-check-docker-syntax.sh
deleted file mode 100755
index 82d609e..0000000
--- a/tools/run-check-docker-syntax.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-### Temp docker syntax checker script. Doesnt really check something...
-set -e
-for file in $(find . -name 'Dockerfile.j2')
-do
-    fgrep -q FROM $file
-    fgrep -q MAINTAINER $file
-    fgrep -q RUN $file
-done
diff --git a/tools/run-check-yaml-syntax.sh b/tools/run-check-yaml-syntax.sh
new file mode 100755
index 0000000..e393c54
--- /dev/null
+++ b/tools/run-check-yaml-syntax.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+### Temp yaml syntax checker script.
+set -e
+for file in $(find . -name '*.yaml'); do
+    yamllint -d relaxed $file
+done
diff --git a/tox.ini b/tox.ini
index 293a287..7efb0df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,14 @@
 [tox]
 minversion = 1.6
-envlist = py34,py27,pypy,pep8
+envlist = linters,bashate
 skipsdist = True
 
 [testenv:linters]
+deps = yamllint
 commands =
-    {toxinidir}/tools/run-check-docker-syntax.sh
-
-[testenv:pep8]
-commands =
-    {toxinidir}/tools/run-check-docker-syntax.sh
+    {toxinidir}/tools/run-check-yaml-syntax.sh
 
 [testenv:bashate]
-commands =
-    {toxinidir}/tools/run-check-docker-syntax.sh
+deps = bashate>=0.2
+whitelist_externals = bash
+commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v"