diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ea40a9..4cf864e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,5 +2,5 @@
 image: quay.io/ansible/molecule:2.19
 
 yamllint:
-  script: yamllint .
+  script: yamllint -c .yamllint.yml .
 ...
diff --git a/.yamllint.yml b/.yamllint.yml
new file mode 100644
index 0000000..bcc5101
--- /dev/null
+++ b/.yamllint.yml
@@ -0,0 +1,7 @@
+---
+extends: default
+
+rules:
+  line-length:
+    level: warning
+...
diff --git a/ldap.yml b/ldap.yml
index 899461c..59d33f3 100644
--- a/ldap.yml
+++ b/ldap.yml
@@ -6,6 +6,6 @@
 
 # Clone LDAP on local geographic location
 # DON'T DO THIS AS IT RECREATES THE REPLICA
-#- hosts: ldap-replica
-#  roles:
-#    - ldap-replica
+# - hosts: ldap-replica
+#   roles:
+#     - ldap-replica
diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index 2913b08..7d6399a 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -29,7 +29,9 @@
 
 # Configure APT mirrors on Debian Stretch
 - name: Configure APT mirrors
-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_release == 'stretch'
   template:
     src: 'apt/sources.list.j2'
     dest: '/etc/apt/sources.list'
diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml
index 38f36a1..f6e30d4 100644
--- a/roles/codimd/tasks/0_apt_dependencies.yml
+++ b/roles/codimd/tasks/0_apt_dependencies.yml
@@ -1,7 +1,9 @@
 ---
 # For NodeJS package
 - name: Configure NodeJS pin
-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_release == 'stretch'
   template:
     src: apt/nodejs.j2
     dest: /etc/apt/preferences.d/nodejs
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index 6a5a728..f6f7e0c 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -1,7 +1,9 @@
 ---
 # For DokuWiki package
 - name: Configure Debian Buster mirrors
-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_release == 'stretch'
   template:
     src: apt/buster.list.j2
     dest: /etc/apt/sources.list.d/buster.list
@@ -9,7 +11,9 @@
 
 # For DokuWiki package
 - name: Configure DokuWiki pin
-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_release == 'stretch'
   template:
     src: apt/dokuwiki.j2
     dest: /etc/apt/preferences.d/dokuwiki
diff --git a/roles/etherpad/tasks/0_apt_dependencies.yml b/roles/etherpad/tasks/0_apt_dependencies.yml
index 6fc917b..ca6a348 100644
--- a/roles/etherpad/tasks/0_apt_dependencies.yml
+++ b/roles/etherpad/tasks/0_apt_dependencies.yml
@@ -1,7 +1,9 @@
 ---
 # For NodeJS package
 - name: Configure NodeJS pin
-  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_release == 'stretch'
   template:
     src: apt/nodejs.j2
     dest: /etc/apt/preferences.d/nodejs
diff --git a/roles/ldap-client/tasks/0_install_ldap.yml b/roles/ldap-client/tasks/0_install_ldap.yml
index 3019372..45b72ea 100644
--- a/roles/ldap-client/tasks/0_install_ldap.yml
+++ b/roles/ldap-client/tasks/0_install_ldap.yml
@@ -12,11 +12,11 @@
 
 # Reduce LDAP load
 # For the moment it is broken on Stretch when using PHP7.3
-#- name: Install LDAP cache package
-#  apt:
-#    name: nscd
-#    state: present
-#    update_cache: yes
+# - name: Install LDAP cache package
+#   apt:
+#     name: nscd
+#     state: present
+#     update_cache: yes
 
 # Configure /etc/nslcd.conf
 - name: Configure nslcd LDAP credentials