diff --git a/group_vars/all b/group_vars/all
new file mode 100644
index 0000000..251ae3e
--- /dev/null
+++ b/group_vars/all
@@ -0,0 +1,26 @@
+---
+hetzner_webservice_username: '<hetzner_webservice_username>'
+hetzner_webservice_password: '<hetzner_webservice_password>'
+rescue_authorized_key: '<fingerprint of ssh key to use in rescue mode>'
+authorized_keys:
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrd5xaZDgYIxjbIHgtheNuySdPEu1hFLph3g1FnhLKt niyawe@niyawe.de
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2I7IRe94zaC3BSOEE/eLtVfyJCjSlBiPvmSqCoNBZWFkkdFC7LMbG6YUJgz0O9dQGToPc4Qt5pUszAPCM7XdDxbmWRkHOxhk0aNsnQ22aQT+DU+E2oQn7ovlOXyvrNXyRdsrNSU1AOnK0tsn4bAJnCj/KAvV7Py4JZkpblYX9xqZFwuIvii7zjLch0S2nCibZmJ+fme/l1mYWRChNZNriChFHdcv2bZDz5KQKGJ7pW3rZrbVM6/gSBEfObJkGEtXhnguqt76o0aa5LuMYEqerbbwdWgY8W5Yx3L195I65jgI3Qi6VX6VETT8UXkyxRLfhf/OrPDeblED9dHKUo10n ataflinski@manning
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqHLdqtNAK78MAbQkvuq35sjZ/QvJIQDulhovu4AA5t88WWj91+HCYSRto9rsPXNXG6D9EjiFJFM55UUe1lQjM8wP6/nBCG5BPhqksVd20SR9IY4kmYAniedKwL85MCYsLIptHaH2OUm7aXmY61CvtpwcqTpthQicup9K+Oh1SLQOBNEZ98zBfxLmvebHYBXtHgm+tFuUQrJn8Pnlx1tkjwijgi3ysqdzs24WVV5DbLb4f78NAUuyOWkoVHqMhlF4G8UFPOA/i0fFZLMLzTlOFwknJPDtLoj3QSfAGDRy7hySo+X7c3rPdjnDqd00cggq0XbYAEMqic4+61bPCGzQMAz/+LVntG2N60Uj6YpDNCpVp9NAFzymbye7xYUqUYJ96DGnRSOvBG6mydNteSCqjjWZyMGvMxJNeuXgfwkNX74WKruil/LlB0Y5iao1qW49/bi8ZIMVBpmw+JDKSQn/odNqgU+S4GkUVsiHrg1FMVQj0GHyNATiR3VbSlX9pvzfWzCiNYWNj0lowEQ5grkuRjnUukAjWZNp7rsyO0+JAVwTb/qIyx+pcRw90aWtLTUMYGFBsigpqK+r4rLsv6F9tfyQ7YBRqFMpVgSKoOguChDMvubyjVaj/IUh83W4UFT8Jzq0+4Ruj0PDlX7BHFzqbnySdTuqJr8cOQgK9qIq06w== adlerweb@OP-Server
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDViQ3+m2l5GcYcEY+wd8DYbC0r3ChS2eR496XlkUg1+M6LQXbSn2w3SEXAOlSiWEsItfuLEyDaqK4y/8ZuWLo45DdnTWPbBgSakayEd8+a9rhz0woP9fCDKusF8Wj/tzGcD2klF0bhSsB4TfIjEPn0B3H3ikbqBF0X26cZmOnXa1E14yeiyxHaMag0aNV1gmGSKE9XOqen3vVP86Tw23b1mb4qCN+SCK/JQAlLJmhPcuRU3jMIgV7+2F40Z/yhT2utietUtAzsG2Vxt+qnvDPbSoA5l3ygmzgIxmlBXEM0G6M464ZA6FoUXXUZ+HxqBvJI5X+OBAoXS75mRcZyNXS3sFIxZWdwChMGejRnnYfnrkwaCe5RSv+hjHH5B3ysHgmDDV4vTbA21e+yQHGFYAzWAe9kG8CcucHa3fQBwS2s0fhxxaqilxGytTrcL3rBxNTvTgqHIg5oDIRbiJh6T3dr5T871R/BZ9y6hHKx/vcedUI+QwF3B7L+mzNuQY+GJZJXZ3560j7RLJ1mvSBFYCtYjcfBzfbC4kU34HhY4+NAgK8pXwsG+YE0YdcZ4bYgvCpMYyQquKBjvMBzFkzHd6fpWotIU0EKBGSmusGvRykBxNmbphWrp3bd+Oi9dzVRiNf22K0JsfvODWhLOeearuBwWoKjaMQkadNo23YNIdjvMw== norbert
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRUNWQj0vmWciklwjItP3bEth7fY52z99zndJ6Z3wJj lars@lapoppermann
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0zC4tuyKQRoVHhNpYTsOIeLbadG43jy0ZW6QWQ4VCcmrR/ccE/P03Y4IGf4fNlnSzOjc3sTjR9+qKUbyNeVRSGUlBT6alYSqAzSTZ/dtzmnYl1Ce/WKw0J1E4C6v8TaKKsqDl0p4DoYuIihW71m2syNFSph8uO2KWZ8YNGifC/wRx9ZZQTNvsuSo0OWhiiXETs1c8a51wtqQmTEZ2b8ownX/ibJV+SEF+o+poiz0A8qDyBpcb4N2hoVd0WWy0CFkYTC6oHPlsVSowJxsj86c3o/3fcxNKwy7XNOM0lzvL/j7mVVTJyW1984p7GJ4Z+TWRRIOEHbu3OLIwk7XfF5257/GiuFuvbBIzg1/lEssdesDjdbucVCK544ZR1kcNMJ23SWJQ8tPVhZ/ED1mzou7BLlIJgewbfx3IklzSVeNlFgua+lKJ3J6WQL7SVDog1DPHLLEupsCGkM8Put8NKm6DUP/saXOLr3ulMlqjZIcvFpDx+HcBFr7NPTTPUVkSBiZwlypLAHghVMASvDoXK3hgZI+tuTcAhSMQ9dUEhEMP4OxP8aqsnl1EDfIV434XZpF007qWQviqi4LXlYlDZidtPt32kQDPRSgl4uk0YgBGOmqtY3k0QDSJIsonMeSOJ3DE2n41MWxYcOWzXKhscDC7I0prh4lJNGKxfFjvhC6rqQ== patrik@uni-koblenz.de
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2bbsrZLJ2271iSb04qpoUDlbrH19aTXUlzFaQSp1KO0BjCxdNvY1x6ZjkIPUC0YeaVGePu0cBJFWYZKpPRiz5hbWeFgaVvhbAlhxAMSlgdjLiN2alc92mBX40NhrpgSV/hGB5KAqqBQr9y01g9I5GRl9jdXgzUA9hhbqxls6tvXxGN2SJC3TFbUj+2PPpn8Cw2ZJiKsKZIoQfs9ZQuv2xDi7E6voqBALlYWd217ZgBezklrpm48dDisGI/WdZyllgk0XyxXwRSSD8QINTPjWmKXk5ZNH65J0KyDlnrZsgQuQbsN3jGgJsPfR6tydVITd1IXtSwawUYZ+JU8wwp6CR sebastian@gartenzwerk
+influx_user: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64393466646161346131343130636632396162376664333366663238643938666263623238613437
+          6637393034383233663230313638636631353734666365320a396366646234383165616561356561
+          32643763333635663738306137646236636532303735663539633337356562376439323338386339
+          6337396163633731350a373164326435363634613238663463373534313434643964653930376533
+          3163
+influx_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          32306561353961366237383834616333636136393838306330323135653232626437666162393932
+          6566663234383666623165363861663336653339633636630a643865663439306536323538623935
+          38396438636234333431626466643732666562363963666534333535353164663365336631393534
+          6662333331616366620a313635346565623863376232646566303864616564613234393437656535
+          33366461613461333130623661616166393733636438643963363361643337643736
diff --git a/group_vars/all.sample b/group_vars/all.sample
deleted file mode 100644
index 48ca06c..0000000
--- a/group_vars/all.sample
+++ /dev/null
@@ -1,7 +0,0 @@
----
-hetzner_webservice_username: <hetzner_webservice_username>
-hetzner_webservice_password: <hetzner_webservice_password>
-rescue_authorized_key: <fingerprint of ssh key to use in rescue mode>
-authorized_keys:
-  - key1
-  - key2
diff --git a/group_vars/uplink b/group_vars/uplink
new file mode 100644
index 0000000..d524bf0
--- /dev/null
+++ b/group_vars/uplink
@@ -0,0 +1,10 @@
+wireguard_bb_peers:
+#  - name: 'fastd4'
+#    endpoint: '2a01:4f8:160:84c3:2::5'
+#    pub_key: 'BXpHhJduwAi+t9yk8tOHnups3sdSMxHZjWX8KXlZpDQ='
+#    ipv4: '10.222.0.4'
+#    port: 10150
+  - name: 'olfba'
+    pub_key: 'krLcak3R0BJkKViAL/o5XyE9fgvMTsSWuCTEoXXCiQk='
+    ipv4: '10.222.0.212'
+    port: 10151
diff --git a/group_vars/uplink.sample b/group_vars/uplink.sample
deleted file mode 100644
index 4465891..0000000
--- a/group_vars/uplink.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-wireguard_bb_peers:
-  - name: 'fastd4'
-    endpoint: '<ipv6 endpoint>'
-    pub_key: '<wireguard public key>'
-    ipv4: '<ipv4>'
-    port: <port>