diff --git a/.gitreview b/.gitreview
index 3cd0524..3d9ab17 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.fuel-infra.org
+host=review.openstack.org
 port=29418
-project=nextgen/ms-memcached.git
+project=openstack/fuel-ccp-memcached.git
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index de136d5..16e2817 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,4 +1,4 @@
 configs:
     memcached_addr: 0.0.0.0
     memcached_port: 11211
-    memcached_ram: 256
\ No newline at end of file
+    memcached_ram: 256
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 134fa3a..1e61e26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,12 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = bashate
+envlist = linters,bashate
+
+[testenv:linters]
+deps = yamllint
+commands =
+    {toxinidir}/tools/run-check-yaml-syntax.sh
 
 [testenv:bashate]
 commands = bash -c "exit 0"