diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
new file mode 100644
index 0000000..7c76ee4
--- /dev/null
+++ b/group_vars/all/vars.yml
@@ -0,0 +1,59 @@
+---
+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
+  - logname: "mg95"
+    viewname: "Maximilian Grau"
+    email: "mg-95@t-online.de"
+    ssh_pub:
+      - !unsafe >
+        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBbBAe+a2Trndg//SektpCCk51L57EOfxSItPLtdKNAz mg@mg-POWER-PC
+      - !unsafe >
+        ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+g0OG72020L0J8CHWUGItkjiX3ibrGQeiRc+cowQ7QOmX4/ifa7PraTlthpqFX24yfYpgF0vEIViySeaLsGyHWbmVstcbnpwyGcL/EdA7UDnHI9nf2mha8xfzD+4O/6pchTEWif4HVnHDSAZOsBGuuGDSHkL8+Mq28AnBZErumB7C4319/WvrfRYM00DC15oVImEeGHIALCS+3OXzNGuXTMk2dyDb2u8pjykxZ/MxE9Jgt6FwXwxvsmloSP6bmyitZ+ZtS3gHkLetRVcvnLlRL7juXHbKsAB830RDH5b6/zQCeQ8vON8rfOOSknRD16YK/fe+P2u1Kyiic8mXuI2y/mX9uQq2q4Lr6rUCuNPcA9MZBghmdECZk+oGS/pzvDnFYTXzFor9UusIeR9F6SOilC2tmVdxs9K5xNUIQnsx8pVjUeb72ZMZIOI4A7H4sRuuQeuDG7UZpN6RKtU6uCC3/8d/0hd4CydQr2PAgBo+8VyuABAxav96+k1GN6OEIJbk736xrVoLxjCbUFimrJikj0t89J4WpJdYS1rRG+oEyAIK0mFJ7MFh1og3pGLbbO49d6GLSGlxsb4JtMkhYQJ3QN1QjKKBEreOmOZslvxaFcrVHd22SIgzvYrwQJ/eM/e7PNMCoOxOZDiN58zDAy5x4As6RI53jDiAFvxqJS7RjQ== maximilian.grau@st.ovgu.de
+    sudo: yes
+    docker: yes
+
+# Data for DD24 dyndns updates
+dyndns_domain: "dyndns.n39.eu"
+dyndns_password: "{{ vault_dyndns_password }}"
diff --git a/group_vars/all/vault b/group_vars/all/vault
new file mode 100644
index 0000000..1e42948
--- /dev/null
+++ b/group_vars/all/vault
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+34303066383937623831333466333965323161376134353838346235323662373164303163363734
+3134626237346361656533636161363331666537633538380a613761643431356530343663626666
+62646361316364333533316638646261373661633863363733366337373338336565366536386237
+3138646266613837310a396139363830613463393861336161363533343362383462623265356563
+31333862613937306463353130316365636634353862363039663762326263313366363530636631
+3630653638333831303432316266633833643739643533353536
diff --git a/inventory.yml b/inventory.yml
index ce5a430..dddefc5 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -1,71 +1,5 @@
 ---
 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
-      - logname: "mg95"
-        viewname: "Maximilian Grau"
-        email: "mg-95@t-online.de"
-        ssh_pub:
-          - !unsafe >
-            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBbBAe+a2Trndg//SektpCCk51L57EOfxSItPLtdKNAz mg@mg-POWER-PC
-          - !unsafe >
-            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+g0OG72020L0J8CHWUGItkjiX3ibrGQeiRc+cowQ7QOmX4/ifa7PraTlthpqFX24yfYpgF0vEIViySeaLsGyHWbmVstcbnpwyGcL/EdA7UDnHI9nf2mha8xfzD+4O/6pchTEWif4HVnHDSAZOsBGuuGDSHkL8+Mq28AnBZErumB7C4319/WvrfRYM00DC15oVImEeGHIALCS+3OXzNGuXTMk2dyDb2u8pjykxZ/MxE9Jgt6FwXwxvsmloSP6bmyitZ+ZtS3gHkLetRVcvnLlRL7juXHbKsAB830RDH5b6/zQCeQ8vON8rfOOSknRD16YK/fe+P2u1Kyiic8mXuI2y/mX9uQq2q4Lr6rUCuNPcA9MZBghmdECZk+oGS/pzvDnFYTXzFor9UusIeR9F6SOilC2tmVdxs9K5xNUIQnsx8pVjUeb72ZMZIOI4A7H4sRuuQeuDG7UZpN6RKtU6uCC3/8d/0hd4CydQr2PAgBo+8VyuABAxav96+k1GN6OEIJbk736xrVoLxjCbUFimrJikj0t89J4WpJdYS1rRG+oEyAIK0mFJ7MFh1og3pGLbbO49d6GLSGlxsb4JtMkhYQJ3QN1QjKKBEreOmOZslvxaFcrVHd22SIgzvYrwQJ/eM/e7PNMCoOxOZDiN58zDAy5x4As6RI53jDiAFvxqJS7RjQ== maximilian.grau@st.ovgu.de
-        sudo: yes
-        docker: yes
-
-    # Data for DD24 dyndns updates
-    dyndns_domain: "dyndns.n39.eu"
-    dyndns_password: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      65653833376630636530373933326362316164353965643732323634393934383764376563613063
-      6632333438636434376666666132313139393363366665380a353737326231613862333866323031
-      30353966366436613433363937643463613332643133643637643232633238373638303063646635
-      3132306530356431630a333538616466643933643230383165646362643738616237383937666332
-      3164
-
   hosts:
     tau.netz39.de:
       server_admin: "admin+tau@netz39.de"