diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml
new file mode 100644
index 0000000..1c50bba
--- /dev/null
+++ b/host_vars/pottwal.n39.eu/vars.yml
@@ -0,0 +1,36 @@
+server_admin: "admin+pottwal@netz39.de"
+ansible_python_interpreter: /usr/bin/python3
+data_dir: "/srv/data"
+
+# These values need to be set up in RabbitMQ
+cleanuri_amqp_host: "rabbitmq.n39.eu"
+cleanuri_amqp_user: "cleanuri"
+cleanuri_amqp_pass: "{{ vault_cleanuri_amqp_pass }}"
+cleanuri_amqp_vhost: "/cleanuri"
+
+shlink_host_port: 8083
+shlink_domain_name: sl.n39.eu
+shlink_geolite_license_key: "{{ vault_shlink_geolite_license_key }}"
+
+hedgedoc_host_port: 8084
+hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.9.3
+hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"
+
+redmine_host_port: 8087
+redmine_image: redmine:4.2.7
+redmine_mysql_image: mysql:5.7
+redmine_database: redmine
+redmine_database_password: "{{ vault_redmine_database_password }}"
+
+influxdb_host_port: 8088
+influxdb_image: influxdb:2.4-alpine
+influxdb_init_username: admin
+influxdb_init_password: "{{ vault_influxdb_init_password }}"
+
+gitea_host_port: 9091
+
+prosody_data_dir: "{{ data_dir }}/prosody"
+prosody_domain_name: jabber.n39.eu
+jabber_host_port: 8086
+
+uptimekuma_host_port: 8085
diff --git a/host_vars/pottwal.n39.eu/vault b/host_vars/pottwal.n39.eu/vault
new file mode 100644
index 0000000..64fa060
--- /dev/null
+++ b/host_vars/pottwal.n39.eu/vault
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34613130633764366239396165376133363264316231303664373664366264623464643465343738
+3331616138303039616434633839383438336233633237340a303932343861333131306661323037
+33363561303461653461393530366135376138343962393037306530643639653062313461323564
+6363386239636333660a333065396531616564313839643936346362653564353430316531653163
+64643766653761643665626330653162636165626631623630316366613639363339303062623432
+39386631346265656262656437353032383362653866333935313961316131393664633339346134
+62323561653361306366313831643763336631326235343235623937386533363233623031386431
+62613537396566326164663862333032393431666662653534333331323835666131613239653664
+66626233633238373830393134656537373839623762653836616333373961623838356163323238
+36323235386233643536613766663039353331643139613333336266626262343138656433313163
+34313361316663616233373832393332373766373135396637646430383262613966303036313662
+63323535663133383839666463643036643463646262363737366366633630313662316436383737
+32323830633564663039313835633739346433316562643966613737323662623637386264326666
+66383564353738643963323530323139313136633062326366313863386433306439663433396333
+39316465333431636461306137346465623630313038346531383139333432656366393031613931
+39346664663838656439393039663566333466366336363636643532343031613730323838356436
+3635
diff --git a/inventory.yml b/inventory.yml
index 1c19613..0cb8c2d 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -3,49 +3,6 @@ all:
   hosts:
     tau.netz39.de:
     pottwal.n39.eu:
-      server_admin: "admin+pottwal@netz39.de"
-
-      # These values need to be set up in RabbitMQ
-      cleanuri_amqp_host: "rabbitmq.n39.eu"
-      cleanuri_amqp_user: "cleanuri"
-      cleanuri_amqp_pass: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        36623438333666666263616562386561383564343534383130633336663130323562316337623532
-        6262336637646435666334653834643535316463366132320a393265616331376465383766643539
-        65656130356132333832396266313939326333323161316163653335376266303239663534303731
-        3666383966383463350a616461666534656232666235323333313139353363663763633261346533
-        64623232626531616235386235313763336465366466343334316361396239636337
-      cleanuri_amqp_vhost: "/cleanuri"
-
-      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
-      redmine_database_password: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        31343936363663616665346336616366313761363866353533646464393163363161306331323639
-        3030643563363731646365643362626664633130656265330a623566333734343562393432636336
-        32366339366433626466306634383563343633343736393735336130363462346265646431393839
-        3566326231663663340a383731353935366234643132386438663736313938356266613432303232
-        3165
-      influxdb_init_username: admin
-      influxdb_init_password: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        30316166356665623137386637353262316230616462356365333734323464363438666461323262
-        6463643839386563313765323534386365396131323462650a313737643139656638373265623433
-        37663136346132623166336139303234323433616634336332663133653532643336303362303161
-        3231306434626336370a363265643462366231326263313563306366393930633765633934386362
-        34316566643132353936636661623365663331333636636462316366623366383864
     unicorn.n39.eu:
       server_admin: "admin+unicorn@netz39.de"
     platon.n39.eu:
diff --git a/pottwal.yml b/pottwal.yml
index e3100cf..88ab914 100644
--- a/pottwal.yml
+++ b/pottwal.yml
@@ -2,33 +2,6 @@
 - hosts: pottwal.n39.eu
   become: true
 
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-    data_dir: "/srv/data"
-
-    gitea_host_port: 9091
-
-    shlink_host_port: 8083
-    shlink_domain_name: sl.n39.eu
-
-    prosody_data_dir: "{{ data_dir }}/prosody"
-    prosody_domain_name: jabber.n39.eu
-    jabber_host_port: 8086
-
-    hedgedoc_host_port: 8084
-    hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.9.3
-
-    redmine_host_port: 8087
-    redmine_image: redmine:4.2.7
-    redmine_mysql_image: mysql:5.7
-    redmine_database: redmine
-
-    influxdb_host_port: 8088
-    influxdb_image: influxdb:2.4-alpine
-
-    uptimekuma_host_port: 8085
-
   roles:
     - role: docker_setup
       vars:
@@ -42,7 +15,7 @@
           - name: gitea.n39.eu
           - name: uritools.n39.eu
           - name: uritools-api.n39.eu
-          - name: sl.n39.eu
+          - name: "{{ shlink_domain_name }}"
           - name: pad.n39.eu
           - name: "{{ prosody_domain_name }}"
             alternate_names: