diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51a54c96e1d695722b473c40b05f9774c6b6f2cd..1d636c38752dd12d4ac252ee395fc835ba1d7cb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ---
-image: registry.git.coop/webarch/containers/images/ansible:0.7.0
+image: registry.git.coop/webarch/containers/images/ansible:0.8.0
 variables:
   PY_COLORS: "1"
   ANSIBLE_FORCE_COLOR: "1"
@@ -10,7 +10,6 @@ stages:
 lint:
   stage: lint
   script:
-    - yamllint .
     - molecule lint
 # vim: syntax=yaml
 ...
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index f29aeee1e615a3ae9c2223ee8768a54f9850b79b..b27fbc38417cc3ee2a47984fd035f07581017584 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,13 +3,14 @@ dependency:
   name: galaxy
 platforms:
   - name: instance
-    image: registry.git.coop/webarch/containers/images/ansible:0.5.0
+    image: registry.git.coop/webarch/containers/images/ansible:0.8.0
     pre_build_image: true
 provisioner:
   name: ansible
 lint: |
- set -e
-  yamllint -c .yamllint .
+  set -e
+  find -type f -name '*.j2' -exec ansiblej2lint.py {} +
+  yamllint -f colored -c .yamllint .
   ansible-lint -c .ansible-lint --force-color .
 # vim: syntax=yaml
 ...
diff --git a/tasks/checks.yml b/tasks/checks.yml
index 1a816da3953eb3c2463ea7f559b8b32db2e9c6d3..8514337af47d05e50cda6136ba46ecdfa06908e3 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -193,7 +193,7 @@
     - name: Check PHP version
       block:
 
-        - name: Run phpquery to get the PHP version NOTE that currently having one one version installed is supported
+        - name: Run phpquery to get the PHP version NOTE that currently having only one PHP version installed is supported
           command: phpquery -V
           args:
             strip_empty_ends: true