diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..da54cad
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,10 @@
+---
+extends: default
+
+rules:
+  truthy:
+    allowed-values:
+      - 'true'
+      - 'false'
+      - 'yes'
+      - 'no'
diff --git a/common.yaml b/common.yaml
index db263f6..37fcc84 100644
--- a/common.yaml
+++ b/common.yaml
@@ -22,7 +22,7 @@
     - nextcloud
 
 
-#- hosts: dnsmasq.lan.0rpheus.net
+# - hosts: dnsmasq.lan.0rpheus.net
 #  gather_facts: false
 #  roles:
 #    - dnsmasq
diff --git a/hosts.yaml b/hosts.yaml
index 6733c7a..4976a67 100644
--- a/hosts.yaml
+++ b/hosts.yaml
@@ -5,8 +5,8 @@ all:
     mail.0rpheus.net:
     odroid.lan.0rpheus.net:
       ansible_ssh_host: 192.168.0.15
-    #dnsmasq.lan.0rpheus.net:
-    #  ansible_ssh_host: 192.168.0.3
+    # dnsmasq.lan.0rpheus.net:
+    #   ansible_ssh_host: 192.168.0.3
     pihole.lan.0rpheus.net:
       ansible_ssh_host: 192.168.0.4
 
@@ -56,33 +56,13 @@ all:
           - "odroid 172.30.30.2:80 check"
 
       smokeping:
-         server_defs:
+        server_defs:
           - "odroid-docker 172.30.30.2:1080 check"
 
       bitwarden:
-         server_defs:
+        server_defs:
           - "mail-docker 127.0.0.1:2080 check"
 
       gogs:
         server_defs:
           - "gogs-web-1 127.0.0.1:3000 check"
-
-
-
-
-
-
-#git.0rpheus.net {
-#    proxy / 127.0.0.1:3000 {
-#        except /css /fonts /js /img
-#    }
-#    root /opt/gogs/public/
-#}
-
-#dav.0rpheus.net {
-#    proxy / 127.0.0.1:8009/servlet/dav/ {
-#        transparent
-#    }
-#}
-
-
diff --git a/roles/bitwarden/tasks/main.yaml b/roles/bitwarden/tasks/main.yaml
index f7bb939..60abf1e 100644
--- a/roles/bitwarden/tasks/main.yaml
+++ b/roles/bitwarden/tasks/main.yaml
@@ -15,8 +15,8 @@
     restart_policy: always
     env:
       ADMIN_TOKEN: "{{ bitwarden_admin_token }}"
-    
+
     ports:
       - 127.0.0.1:2080:80
     volumes:
-      - "{{ bitwarden_data }}:/data/:rw"
\ No newline at end of file
+      - "{{ bitwarden_data }}:/data/:rw"
diff --git a/roles/common/handlers/main.yaml b/roles/common/handlers/main.yaml
index e5c142f..4c1dabf 100644
--- a/roles/common/handlers/main.yaml
+++ b/roles/common/handlers/main.yaml
@@ -9,4 +9,8 @@
 
 # handlers for etckeeper
 - name: Record changes in etckeeper
-  shell: "if etckeeper unclean; then etckeeper commit '{{ etckeeper_message }}'; fi"
+  shell: |-
+    if etckeeper unclean
+    then
+      etckeeper commit '{{ etckeeper_message }}'
+    fi
diff --git a/roles/haproxy/tasks/main.yaml b/roles/haproxy/tasks/main.yaml
index fc77389..64b14d0 100644
--- a/roles/haproxy/tasks/main.yaml
+++ b/roles/haproxy/tasks/main.yaml
@@ -14,7 +14,7 @@
     state: absent
 
 
-- name:  add user 'haproxy'
+- name: add user 'haproxy'
   user:
     name: haproxy
     system: yes
diff --git a/roles/nextcloud/defaults/main.yaml b/roles/nextcloud/defaults/main.yaml
index e857551..805b037 100644
--- a/roles/nextcloud/defaults/main.yaml
+++ b/roles/nextcloud/defaults/main.yaml
@@ -1,3 +1,4 @@
+---
 
 nextcloud_data: /srv/nextcloud.0rpheus.net/html/
-nextcloud_version: 16
\ No newline at end of file
+nextcloud_version: 16