diff --git a/README.md b/README.md
index f2ecf45..bd154fc 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ ansible-galaxy install -r requirements.yml
 
 ## Call with
 ```bash
-ansible-playbook -i inventory --ask-vault-pass main.yml
+ansible-playbook -i inventory.yml --ask-vault-pass main.yml
 ```
 
 You need to provide a user with sudo rights and the vault password.
diff --git a/inventory b/inventory
deleted file mode 100644
index 1b02caa..0000000
--- a/inventory
+++ /dev/null
@@ -1,102 +0,0 @@
-all:
-  vars:
-    server_admin: "admin@netz39.de"
-
-    ag_timezone: Europe/Berlin
-
-    users:
-    - logname: "alex"
-      viewname: "Alexander Dahl"
-      email: "alex@netz39.de"
-      ssh_pub:
-      - !unsafe >
-        ssh-rsa
-        AAAAB3NzaC1yc2EAAAADAQABAAABAQDVZPAE3XE8Ek1Ji4sCIHxLVx+bi2qpsTSsYhBqtYysnFn9AHJj14BR59D0Si05sfVkmL4OQoo7Q98oIxy33PgtqoUfgXk9dc7dlsye3t/gsAb25ABnqG/ZYe65nZLN7BzRM1/QZIbd6sSu6eXrNFCh0ikB5se4zgVkDO8t6h2dnz4FvTuIM2Bi/PnIJTqb8+uLQE1vS3A7tTx100ZKXxr81dlo2Y1JBP6WrS1W1IyFiG6wofl2XTY02ssyoENQyR89lLMJYKvm5xlhL/L69gtMsqIX9UBQFk8Rpq04ZIwN6b0K4R142GZvxdJNdQULgtI3gPkKgH7FDoFsRHNA6b/9
-        adahl@ada
-      - !unsafe >
-        ssh-rsa
-        AAAAB3NzaC1yc2EAAAADAQABAAABAQDvczlb1+9d1BjuLk5ZcQt2Z0Dh61Vg91i47tM48CN2koJ4I/9vgN37l6mnr383zD8kQkXDGmCYpXOa48WocyyUuP3h75DCjANYcWOsohQfFu2F1ZOiiVCGduDntzS2nbZEF2W3nZNLQ6/dKKEeaSxu5RjKflkWakghkMt3H4KN20bxzYzHQMLhRYFEGHpskOqeaXKPkqqEP+u5kToINtmXwegCvQFnlx4fNrysFII79buBNlcLsO1X4ABucVMYT/OJnBpJEfEcNFUKrJZRGgM8aDbUpkV9LRY2lywvoKJhiRMc7x7kK0LWOTdPJri+SJhW6fEW4JKCRTSHVN8OS8S/
-        alex@buffy
-      - !unsafe >
-        ssh-rsa
-        AAAAB3NzaC1yc2EAAAABIwAAAQEAsGvQ1COtwA4ERf+Z/IMxlw4RadCVKIQzB6v8n20dDM+bfBmTxk7NeSGbdB/vjvUV0Oq47KfDISDAlwhSv0aSpij3d7twPWrFz7eoFWAGO2mnz39btA1i9ygMypsP56NHZDsgokPoCSX3viKyFhh6qgt6cCOJYwLZix4VoFKaQ7GlqoVKAHz9v3r/Lq15oTRcCoqP7FID4Fp1a51fY2XQltALoQnfZVhqpnJB30U0uv79QCAHS5IC75fmRjm1vo/mmu0Kbu4+KfU2+MIpzx2Y6xyntIpB1Nuk9Xn1ptKw1CmgKcNOKNGkKuegripoAHv6oylTjge61ksDPjhAyisNGQ==
-        alex@falbala
-      - !unsafe >
-        ssh-rsa
-        AAAAB3NzaC1yc2EAAAABIwAAAQEAqx9VCxrcbUrGJ9MOTcS0Jq09bZz3gNKL4mvOXhnMhjbt0IrEENcexwVbk4pSHsezz4LKapvqmT+0U4WiCsU/DtwzLlV7Qgbjoo+Buwzll9Hi+xGn6xIHwvAZoltj2IioIIQgRxF+B/mqGaOU2KN/Yq/2ODMGvPj00VQ2+otLX3XrFoUJX5oot7GsonY2RxrSgOhWCosApgt4MxcuKjyS6VS8RDfdNn522VEPlKevUz5gY7sK5cKcAS3j29+VdXpqewa6jcz0KmQroLXFyJzPkTH2lt5AIurojGtZqbkas/TQPSExun9XpkA3gxuwVKD/uLl/R/7ecagNKdl/+Rtsbw==
-        alex@tiffy
-      - !unsafe >
-        ssh-rsa
-        AAAAB3NzaC1yc2EAAAADAQABAAABAQC92+JJ7C0WYgripJ9hSIb2D/QMzw/rMmeFTTcO34DJNAVIQtq9nb8Ev7s8Bjz3VR7/LS4kQlyB6dp1RLuObPYRafY0695lja4lwgy7iY1OAYCNM71OYyyztcoHEz3fGO4tzNx5Z1tI9zLpS1Wr7ENeKOKBqmFIgZno67Gq+NZr3LHNvnvAsbMsZXOdnld0LmG0Um35WEN60UYz3k6QUYBfaYrHnX2OP9auK5QDnd2jVTdNLRbBus7VtIsCfK3szLa+dFyd/ISPCB/YsZj1i0WmO766Y4GqFTZhIZUok4JuU8pl/7Y9CSKRMx4sp/3LYIAyOsL5EJxmg3fEfYsRK0gb
-        alex@toshy
-      - !unsafe >
-        ssh-ed25519
-        AAAAC3NzaC1lZDI1NTE5AAAAIGmU7MfOFuc6z5Vbwh4CbBFSg19f8B9rUO2ITjgmEvkY
-        alex@lemmy
-      sudo: yes
-      docker: yes
-    - logname: "kwasir"
-      viewname: "Peter Seidel"
-      email: "kwasir@netz39.de"
-      sudo: yes
-      docker: yes
-    - logname: "tux"
-      viewname: "Stefan Haun"
-      email: "tux@netz39.de"
-      ssh_pub:
-      - !unsafe >
-        ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvxbl9eiBojG2zKw2eSftwaMpA4XeONJpPK++WBUBJi+4RhvtN+8YX55cGsRlAA2pvW1a6hxjuR/NEA0+EAZ8ueNaOrMJjHvuUSzO76YF1gHlusAbhYvNl4EYZz/lkrFM4oaa/4/WirgUvSKnpPQx2YgX/AEkIwzk6nQLve+NmijkWdWzaww5snjbAEsgo+iEqeLPRfzbxX4Esp8bqFy3qD0SGgJM8iWlUaWCoQI1HhU4lVBtwdR6cJQ3QnmhUidRLOpIpX1sBRM8Cnwc5g2u3OpsaxPd77+5hXtxKjQUby/YLGmr6L2x1tWYqkV+GZA0Lh3fwM0BjDVT/Y/a+HUVh tux@netz39.de
-      sudo: yes
-      docker: yes
-    - logname: "dkdent"
-      viewname: "David Kilias"
-      email: "dkdent@netz39.de"
-      ssh_pub:
-      - !unsafe >
-        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQd8PoC3umGO8o2ryMlTrzYsKW0KMAzTrQxYXOwvWA7 david@Rhea
-      sudo: yes
-      docker: yes
-
-  hosts:
-    tau.netz39.de:
-      server_admin: "admin+tau@netz39.de"
-      mysql_root_pw: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        64313138383833643866383332623265383863623332343864306537633931326139303638303761
-        6464653933613663643632383935376164393033363233330a313063613832396166666464666136
-        36633532393231663634663034666666356332373438646130643161383134653739663066626538
-        3661663132343639310a613431653031626434323064313465373866666332353931313836623465
-        3461
-    pottwal.n39.eu:
-      server_admin: "admin+pottwal@netz39.de"
-      shlink_geolite_license_key: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        33626234393039623132663736656363356562383235353737313034613630626339303263366665
-        6133333035663566356532303131373066646632363233330a333230376231616461343262623138
-        31356239323439666632333033616366663762646366343839663463633665333863343437343334
-        3665386538393066380a383366346235343531306561643534663035646537666534383536333230
-        34613761363237633865306332653631323366343232353666343165666664343838
-      hedgedoc_postgres_password: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        66333336393263316230626630626234383238343238396463373331633738343663376439653963
-        3536656431633631396634383137323938313663363665370a366132323464373731323564386239
-        38656238663565386631306263333166633064313762343139373735626439666665356530383363
-        3134373261386435310a626461376537643937643838636638313033383463356663396464643361
-        36333766383139376331336633646633396430323663366636616431643134666536
-    unicorn.n39.eu:
-      server_admin: "admin+unicorn@netz39.de"
-    platon.n39.eu:
-      server_admin: "admin+platon@netz39.de"
-      ansible_ssh_user: pi
-    radon.n39.eu:
-      server_admin: "admin+radon@netz39.de"
-    krypton.n39.eu:
-      server_admin: "admin+krypton@netz39.de"
-      ldap_admin_password: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        30646262643765616236666665363366353934333264343064383265316162333033653839396466
-        3262306131373461323032363234323161613431613133360a396531343438313165666163646363
-        65333334666132313834663839626431373339646631366261316139333233666566383131353035
-        3765613264626637660a343562363166313535613964336261356530353732333965313830653865
-        39373837643837663630333765306463616234363535613666333862396632643961
-    oganesson.n39.eu:
diff --git a/inventory.yml b/inventory.yml
new file mode 100644
index 0000000..aece11d
--- /dev/null
+++ b/inventory.yml
@@ -0,0 +1,91 @@
+---
+all:
+  vars:
+    server_admin: "admin@netz39.de"
+
+    ag_timezone: Europe/Berlin
+
+    users:
+      - logname: "alex"
+        viewname: "Alexander Dahl"
+        email: "alex@netz39.de"
+        ssh_pub:
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVZPAE3XE8Ek1Ji4sCIHxLVx+bi2qpsTSsYhBqtYysnFn9AHJj14BR59D0Si05sfVkmL4OQoo7Q98oIxy33PgtqoUfgXk9dc7dlsye3t/gsAb25ABnqG/ZYe65nZLN7BzRM1/QZIbd6sSu6eXrNFCh0ikB5se4zgVkDO8t6h2dnz4FvTuIM2Bi/PnIJTqb8+uLQE1vS3A7tTx100ZKXxr81dlo2Y1JBP6WrS1W1IyFiG6wofl2XTY02ssyoENQyR89lLMJYKvm5xlhL/L69gtMsqIX9UBQFk8Rpq04ZIwN6b0K4R142GZvxdJNdQULgtI3gPkKgH7FDoFsRHNA6b/9 adahl@ada
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDvczlb1+9d1BjuLk5ZcQt2Z0Dh61Vg91i47tM48CN2koJ4I/9vgN37l6mnr383zD8kQkXDGmCYpXOa48WocyyUuP3h75DCjANYcWOsohQfFu2F1ZOiiVCGduDntzS2nbZEF2W3nZNLQ6/dKKEeaSxu5RjKflkWakghkMt3H4KN20bxzYzHQMLhRYFEGHpskOqeaXKPkqqEP+u5kToINtmXwegCvQFnlx4fNrysFII79buBNlcLsO1X4ABucVMYT/OJnBpJEfEcNFUKrJZRGgM8aDbUpkV9LRY2lywvoKJhiRMc7x7kK0LWOTdPJri+SJhW6fEW4JKCRTSHVN8OS8S/ alex@buffy
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsGvQ1COtwA4ERf+Z/IMxlw4RadCVKIQzB6v8n20dDM+bfBmTxk7NeSGbdB/vjvUV0Oq47KfDISDAlwhSv0aSpij3d7twPWrFz7eoFWAGO2mnz39btA1i9ygMypsP56NHZDsgokPoCSX3viKyFhh6qgt6cCOJYwLZix4VoFKaQ7GlqoVKAHz9v3r/Lq15oTRcCoqP7FID4Fp1a51fY2XQltALoQnfZVhqpnJB30U0uv79QCAHS5IC75fmRjm1vo/mmu0Kbu4+KfU2+MIpzx2Y6xyntIpB1Nuk9Xn1ptKw1CmgKcNOKNGkKuegripoAHv6oylTjge61ksDPjhAyisNGQ== alex@falbala
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqx9VCxrcbUrGJ9MOTcS0Jq09bZz3gNKL4mvOXhnMhjbt0IrEENcexwVbk4pSHsezz4LKapvqmT+0U4WiCsU/DtwzLlV7Qgbjoo+Buwzll9Hi+xGn6xIHwvAZoltj2IioIIQgRxF+B/mqGaOU2KN/Yq/2ODMGvPj00VQ2+otLX3XrFoUJX5oot7GsonY2RxrSgOhWCosApgt4MxcuKjyS6VS8RDfdNn522VEPlKevUz5gY7sK5cKcAS3j29+VdXpqewa6jcz0KmQroLXFyJzPkTH2lt5AIurojGtZqbkas/TQPSExun9XpkA3gxuwVKD/uLl/R/7ecagNKdl/+Rtsbw== alex@tiffy
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC92+JJ7C0WYgripJ9hSIb2D/QMzw/rMmeFTTcO34DJNAVIQtq9nb8Ev7s8Bjz3VR7/LS4kQlyB6dp1RLuObPYRafY0695lja4lwgy7iY1OAYCNM71OYyyztcoHEz3fGO4tzNx5Z1tI9zLpS1Wr7ENeKOKBqmFIgZno67Gq+NZr3LHNvnvAsbMsZXOdnld0LmG0Um35WEN60UYz3k6QUYBfaYrHnX2OP9auK5QDnd2jVTdNLRbBus7VtIsCfK3szLa+dFyd/ISPCB/YsZj1i0WmO766Y4GqFTZhIZUok4JuU8pl/7Y9CSKRMx4sp/3LYIAyOsL5EJxmg3fEfYsRK0gb alex@toshy
+          - !unsafe >
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmU7MfOFuc6z5Vbwh4CbBFSg19f8B9rUO2ITjgmEvkY alex@lemmy
+        sudo: yes
+        docker: yes
+      - logname: "kwasir"
+        viewname: "Peter Seidel"
+        email: "kwasir@netz39.de"
+        sudo: yes
+        docker: yes
+      - logname: "tux"
+        viewname: "Stefan Haun"
+        email: "tux@netz39.de"
+        ssh_pub:
+          - !unsafe >
+            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvxbl9eiBojG2zKw2eSftwaMpA4XeONJpPK++WBUBJi+4RhvtN+8YX55cGsRlAA2pvW1a6hxjuR/NEA0+EAZ8ueNaOrMJjHvuUSzO76YF1gHlusAbhYvNl4EYZz/lkrFM4oaa/4/WirgUvSKnpPQx2YgX/AEkIwzk6nQLve+NmijkWdWzaww5snjbAEsgo+iEqeLPRfzbxX4Esp8bqFy3qD0SGgJM8iWlUaWCoQI1HhU4lVBtwdR6cJQ3QnmhUidRLOpIpX1sBRM8Cnwc5g2u3OpsaxPd77+5hXtxKjQUby/YLGmr6L2x1tWYqkV+GZA0Lh3fwM0BjDVT/Y/a+HUVh tux@netz39.de
+        sudo: yes
+        docker: yes
+      - logname: "dkdent"
+        viewname: "David Kilias"
+        email: "dkdent@netz39.de"
+        ssh_pub:
+          - !unsafe >
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQd8PoC3umGO8o2ryMlTrzYsKW0KMAzTrQxYXOwvWA7 david@Rhea
+        sudo: yes
+        docker: yes
+
+  hosts:
+    tau.netz39.de:
+      server_admin: "admin+tau@netz39.de"
+      mysql_root_pw: !vault |
+        $ANSIBLE_VAULT;1.1;AES256
+        64313138383833643866383332623265383863623332343864306537633931326139303638303761
+        6464653933613663643632383935376164393033363233330a313063613832396166666464666136
+        36633532393231663634663034666666356332373438646130643161383134653739663066626538
+        3661663132343639310a613431653031626434323064313465373866666332353931313836623465
+        3461
+    pottwal.n39.eu:
+      server_admin: "admin+pottwal@netz39.de"
+      shlink_geolite_license_key: !vault |
+        $ANSIBLE_VAULT;1.1;AES256
+        33626234393039623132663736656363356562383235353737313034613630626339303263366665
+        6133333035663566356532303131373066646632363233330a333230376231616461343262623138
+        31356239323439666632333033616366663762646366343839663463633665333863343437343334
+        3665386538393066380a383366346235343531306561643534663035646537666534383536333230
+        34613761363237633865306332653631323366343232353666343165666664343838
+      hedgedoc_postgres_password: !vault |
+        $ANSIBLE_VAULT;1.1;AES256
+        66333336393263316230626630626234383238343238396463373331633738343663376439653963
+        3536656431633631396634383137323938313663363665370a366132323464373731323564386239
+        38656238663565386631306263333166633064313762343139373735626439666665356530383363
+        3134373261386435310a626461376537643937643838636638313033383463356663396464643361
+        36333766383139376331336633646633396430323663366636616431643134666536
+    unicorn.n39.eu:
+      server_admin: "admin+unicorn@netz39.de"
+    platon.n39.eu:
+      server_admin: "admin+platon@netz39.de"
+      ansible_ssh_user: pi
+    radon.n39.eu:
+      server_admin: "admin+radon@netz39.de"
+    krypton.n39.eu:
+      server_admin: "admin+krypton@netz39.de"
+      ldap_admin_password: !vault |
+        $ANSIBLE_VAULT;1.1;AES256
+        30646262643765616236666665363366353934333264343064383265316162333033653839396466
+        3262306131373461323032363234323161613431613133360a396531343438313165666163646363
+        65333334666132313834663839626431373339646631366261316139333233666566383131353035
+        3765613264626637660a343562363166313535613964336261356530353732333965313830653865
+        39373837643837663630333765306463616234363535613666333862396632643961
+    oganesson.n39.eu: