diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000000000000000000000000000000000000..cca80e2e16c9ee5298e8a5bcf9f77c130fdc3d8e
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,19 @@
+---
+
+extends: default
+
+rules:
+  comments-indentation:
+    level: warning
+  document-start:
+    level: error
+  empty-lines:
+    max: 1
+  empty-values:
+    forbid-in-flow-mappings: true
+    forbid-in-block-mappings: true
+  line-length:
+    level: warning
+  octal-values:
+    forbid-implicit-octal: true
+    level: warning
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index 933024a97deaad8f5e29e00b92d353d5f0f2a2b7..148223f132a22851860b1ada14683ef6e09239e1 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -26,7 +26,10 @@
     - mysql
 
 - name: ensure mysql is started
-  service: name=mysql state=started enabled=yes
+  service:
+    name: mysql
+    state: started
+    enabled: true
   tags:
     - service
     - mysql
@@ -34,12 +37,14 @@
 - name: ensure the mysql root user exists and has the correct password
   mysql_user:
     name: root
+    # yamllint disable-line rule:line-length
     password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
     login_user: root
+    # yamllint disable-line rule:line-length
     login_password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
   register: mysql_root_creation_result
-  no_log: True
-  ignore_errors: yes
+  no_log: true
+  ignore_errors: true
   tags:
     - mysql
     - config
@@ -47,8 +52,9 @@
 - name: initialize the mysql root user
   mysql_user:
     name: root
+    # yamllint disable-line rule:line-length
     password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
-  no_log: True
+  no_log: true
   when: mysql_root_creation_result|failed
   tags:
     - mysql
diff --git a/postgres/defaults/main.yml b/postgres/defaults/main.yml
index 496c92ba5ca3437caa60187b6cf0881f7a3da722..2e7fe542a2d19b421623550c14110069c1c1e793 100644
--- a/postgres/defaults/main.yml
+++ b/postgres/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 
-postgres_enable_frequently: True
+postgres_enable_frequently: true
diff --git a/postgres/tasks/main.yml b/postgres/tasks/main.yml
index c3df75179e5000dbb89532e39d16594205d06f4f..c9d809047690c4b564f5084efbd9137efa0f3f71 100644
--- a/postgres/tasks/main.yml
+++ b/postgres/tasks/main.yml
@@ -15,7 +15,7 @@
   service:
     name: postgresql
     state: started
-    enabled: yes
+    enabled: true
   tags:
     - postgres
 
@@ -34,7 +34,7 @@
     dest: /usr/local/bin/
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
   tags:
     - postgres
     - rsnapshot
@@ -46,7 +46,7 @@
     dest: /etc/
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
   tags:
     - postgres
     - rsnapshot
@@ -58,7 +58,7 @@
     dest: /etc/cron.d/postgres-snapshot
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
   tags:
     - postgres
     - rsnapshot