diff --git a/roles/borg-client/defaults/main.yml b/roles/borg-client/defaults/main.yml
index 7ed694e..c906be6 100644
--- a/roles/borg-client/defaults/main.yml
+++ b/roles/borg-client/defaults/main.yml
@@ -1,3 +1,5 @@
+---
+
 borg_pass: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           62333166623737363731663766353330633335306532306366356536376232396664376430613434
diff --git a/roles/borg-client/tasks/main.yml b/roles/borg-client/tasks/main.yml
index 55a3472..47824ca 100644
--- a/roles/borg-client/tasks/main.yml
+++ b/roles/borg-client/tasks/main.yml
@@ -1,6 +1,8 @@
+---
+
 - name: create SSH key
   openssh_keypair:
-      path: ~/.ssh/id_rsa
+    path: ~/.ssh/id_rsa
 
 - name: get SSH pub key
   command: cat ~/.ssh/id_rsa.pub
@@ -8,19 +10,19 @@
 
 - name: put backup script
   template:
-      src: borgbackup.sh.j2
-      dest: /usr/local/bin/borgbackup.sh
-      owner: root
-      group: root
-      mode: '0750'
+    src: borgbackup.sh.j2
+    dest: /usr/local/bin/borgbackup.sh
+    owner: root
+    group: root
+    mode: '0750'
 
 - name: cron the backup script
   cron:
-      name: "borg backup script"
-      hour: "{{ borg_backup_hour }}"
-      minute: "{{ borg_backup_minute }}"
-      job: /usr/local/bin/borgbackup.sh
+    name: "borg backup script"
+    hour: "{{ borg_backup_hour }}"
+    minute: "{{ borg_backup_minute }}"
+    job: /usr/local/bin/borgbackup.sh
 
 - name: warns about borg init
   debug:
-      msg: "Borg has been installed. Don’t forget to init with: \nborg init --encryption=repokey-blake2 backup@{{ hostvars[groups['borg_server'][0]]['ansible_fqdn'] }}:home"
+    msg: "Borg has been installed. Don’t forget to init with: \nborg init --encryption=repokey-blake2 backup@{{ hostvars[groups['borg_server'][0]]['ansible_fqdn'] }}:home"
diff --git a/roles/borg-server/tasks/main.yml b/roles/borg-server/tasks/main.yml
index 33dd0c4..40320dc 100644
--- a/roles/borg-server/tasks/main.yml
+++ b/roles/borg-server/tasks/main.yml
@@ -1,34 +1,36 @@
+---
+
 - name: mount backup disk
   mount:
-      path: /backup
-      src: LABEL=BACKUP
-      fstype: ext4
-      opts: noatime,nofail
-      state: mounted
+    path: /backup
+    src: LABEL=BACKUP
+    fstype: ext4
+    opts: noatime,nofail
+    state: mounted
 
 - name: create backup user
   user:
-      name: backup
-      comment: Backup
-      create_home: yes
-      home: /backup
-      shell: /bin/bash
-      system: yes
-      state: present
+    name: backup
+    comment: Backup
+    create_home: true
+    home: /backup
+    shell: /bin/bash
+    system: true
+    state: present
 
 - name: "create directory for borg clients"
   file:
-      path: "/backup/repos/{{ hostvars[item]['ansible_fqdn'] }}"
-      state: directory
-      mode: '0750'
-      owner: backup
-      group: backup
+    path: "/backup/repos/{{ hostvars[item]['ansible_fqdn'] }}"
+    state: directory
+    mode: '0750'
+    owner: backup
+    group: backup
   loop: "{{ groups['borg_client'] }}"
 
 - name: "set authorized_keys for borg clients"
   authorized_key:
-      user: backup
-      key: "{{ hostvars[item]['ssh_keys']['stdout'] }}"
-      key_options: "command=\"cd /backup/repos/{{ hostvars[item]['ansible_fqdn'] }}; borg serve --restrict-to-path /backup/repos/{{ hostvars[item]['ansible_fqdn'] }}\""
-      state: present
+    user: backup
+    key: "{{ hostvars[item]['ssh_keys']['stdout'] }}"
+    key_options: "command=\"cd /backup/repos/{{ hostvars[item]['ansible_fqdn'] }}; borg serve --restrict-to-path /backup/repos/{{ hostvars[item]['ansible_fqdn'] }}\""
+    state: present
   loop: "{{ groups['borg_client'] }}"
diff --git a/roles/borgbackup/tasks/main.yml b/roles/borgbackup/tasks/main.yml
index 38498be..0dc7a3d 100644
--- a/roles/borgbackup/tasks/main.yml
+++ b/roles/borgbackup/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - set_fact:
     borgbackup: borg
     when: ansible_facts['distribution'] == "Archlinux"
@@ -6,6 +8,5 @@
     when: ansible_facts['distribution'] == "Debian"
 - name: install borg package
   package:
-      name: "{{ borgbackup }}"
-      state: present
-#  when: ansible_facts['distribution'] == "Debian"
+    name: "{{ borgbackup }}"
+    state: present