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/journal-remote/handlers/main.yml b/journal-remote/handlers/main.yml
index 6fccb1a38f6c7705bd445b9c4467e32142f47523..2b04fb4a0b43b2c037f2b789c44e32547846a71c 100644
--- a/journal-remote/handlers/main.yml
+++ b/journal-remote/handlers/main.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Run systemd-tmpfiles
   command: systemd-tmpfiles --create --prefix=/var/log/journal/remote
 
diff --git a/journal-remote/tasks/main.yml b/journal-remote/tasks/main.yml
index 3f26c76c7ef9c8f5a5ef7e82ed215d2b98a428db..f8bc7a6236aa8ee0bbf4b6ca9805f8777e2b1d8b 100644
--- a/journal-remote/tasks/main.yml
+++ b/journal-remote/tasks/main.yml
@@ -1,4 +1,7 @@
-- name: ensure there are no write barriers on the partition for the remote journals 
+---
+
+# yamllint disable-line rule:line-length
+- name: ensure there are no write barriers on the partition for the remote journals
   mount:
     fstype: ext4
     opts: defaults,nobarrier
@@ -7,7 +10,7 @@
     src: "UUID={{ item.uuid }}"
     passno: 1
   with_items: "{{ ansible_mounts }}"
-  when:  item.mount ==  "/"
+  when: item.mount ==  "/"
   tags:
     - journal-remote
 
@@ -24,7 +27,7 @@
     path: /etc/systemd/system/systemd-journal-remote.service.d
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
     state: directory
   tags:
     - journal-remote
@@ -35,7 +38,7 @@
     dest: /etc/systemd/system/systemd-journal-remote.service.d/http.conf
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
     src: http.conf
   notify:
     - Reload systemd
@@ -67,8 +70,8 @@
 - name: Enable journal-remote service
   systemd:
     name: systemd-journal-remote.socket
-    enabled: yes
-    daemon_reload: yes
+    enabled: true
+    daemon_reload: true
     state: started
   tags:
     - journal-remote
diff --git a/journal-upload/handlers/main.yml b/journal-upload/handlers/main.yml
index ce61d94c838e7dbb2601d9395325724812bdbd3d..c43c7620a96e76cdea51fb33d9fa383b2292af86 100644
--- a/journal-upload/handlers/main.yml
+++ b/journal-upload/handlers/main.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Reload systemd
   systemd: daemon-reload=yes
 
diff --git a/journal-upload/tasks/main.yml b/journal-upload/tasks/main.yml
index fbca18f198a1367a6b6b9c3463df75d1f78251b1..5ace4c456d9f3ceabbf35eaaeb0cb0cc7c1b1d37 100644
--- a/journal-upload/tasks/main.yml
+++ b/journal-upload/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Configure only on Debian ≥Stretch
   when: ansible_distribution_major_version|int >= 9
   block:
@@ -41,7 +43,7 @@
     - name: Enable journal-upload service
       systemd:
         name: systemd-journal-upload.service
-        enabled: yes
+        enabled: true
         state: started
       tags:
         - journal-upload