diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 02a55ad..803f8a5 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -5,12 +5,12 @@ certmgr_mode: webserver
 gogs_domain: git.binary-kitchen.de
 gogs_dbname: gogs
 gogs_dbuser: gogs
-gogs_dbpass: UbRoiq4fuRL3MvxghPww
+gogs_dbpass: "{{ vault_gogs_dbpass }}"
 
 hackmd_domain: pad.binary-kitchen.de
 hackmd_dbname: hackmd
 hackmd_dbuser: hackmd
-hackmd_dbpass: oepaich3haob7AoY
+hackmd_dbpass: "{{ vault_hackmd_dbpass }}"
 hackmd_secret: "{{ vault_hackmd_secret }}"
 
 ldap_ca: /etc/ldap/ssl/BKCA.crt
@@ -18,12 +18,12 @@ ldap_uri: ldaps://ldap.binary.kitchen/
 ldap_host: ldap.binary.kitchen
 ldap_base: dc=binary-kitchen,dc=de
 ldap_binddn: cn=Services,ou=roles,dc=binary-kitchen,dc=de
-ldap_bindpw: svcpwd
+ldap_bindpw: "{{ vault_ldap_bindpw }}"
 
 librenms_domain: librenms.binary.kitchen
 librenms_dbname: librenms
 librenms_dbuser: librenms
-librenms_dbpass: xNUYsUhzwP4u7cVNCECz
+librenms_dbpass: "{{ vault_librenms_dbpass }}"
 
 mail_domain: binary-kitchen.de
 mail_domains:
@@ -52,7 +52,7 @@ nslcd_base_passwd: ou=people,dc=binary-kitchen,dc=de
 owncloud_domain: oc.binary-kitchen.de
 owncloud_dbname: owncloud
 owncloud_dbuser: owncloud
-owncloud_dbpass: tnEykTqtsC9pECz7wAUJ
+owncloud_dbpass: "{{ vault_owncloud_dbpass }}"
 
 prosody_admin: moepman@jabber.binary-kitchen.de
 prosody_domain: jabber.binary-kitchen.de
@@ -60,7 +60,7 @@ prosody_domain: jabber.binary-kitchen.de
 racktables_domain: racktables.binary.kitchen
 racktables_dbname: racktables
 racktables_dbuser: racktables
-racktables_dbpass: chee6iechuz1EghuheiD
+racktables_dbpass: "{{ vault_racktables_dbpass }}"
 
 snmp_allowed:
 - 172.23.2.5
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
index 44f9b72..564c54c 100644
--- a/group_vars/all/vault.yml
+++ b/group_vars/all/vault.yml
@@ -1,7 +1,20 @@
 $ANSIBLE_VAULT;1.1;AES256
-64323839393830353266323861653938663862323663616135396166393532333030313465393563
-6666313061303232383533343362383134663730383761660a666339353639613037663134393334
-65633566363961663138616564353761353931666363613336316335643535363533306461343662
-3339383263396438640a616433336333626632326465363931616461356539656535626432383738
-33356462366339356164373539333636386230376665303561303864366232636463616339653731
-3537623933633964383538633261633133323136366433376232
+36306335393738643138333865653135393433303961636664646631376262646639353236326139
+6163646265666661323338383762616439333263653137660a316464663037616564333235303631
+62376366353464373865386630343562616435323838366261666538333232626433383666613966
+6665313262613237370a616539623339366434396337396163333132333137306466386139316234
+62666465613731656665363163326135356661633636376136326132616134633634356634303333
+35613238353264313330313938376130323736663633343634316165393438613532623034363366
+63373233333137653565616536386232303235303636383166346632306138386462663033373235
+32306366393933336337393232366335303931623130633936393633613831326136623336663264
+64383938633737343333386131653032343864646337666663313730623665363764336633613865
+62363635633330306637356464373134333334346166336166383963616564666664623262353862
+34636236356662623832306431373665353865386334653333366539643138386633646666623534
+62346539643335633230353530633731353733316361663033623434386263303163653834643338
+65666330383464653763643239393731663637373366316137303861326333306337376239626332
+61303964393139616135643563393761363537653663356234343538373035336133396365643039
+65626636666538316363653538303666636161636461376562656466393936333364333231656564
+65373332346463386162306332636337346331386463626263343933663137663832656331343164
+33373235363534343862346236613430613832376533613130663661303637306664383130306664
+66343265633636623362363636343961306335613264323461366164626633333439626464613839
+396364653963343565326335306631346462