diff --git a/host_vars/vpn01/vars.yml b/host_vars/vpn01/vars.yml
index 4eed543..78a86bc 100644
--- a/host_vars/vpn01/vars.yml
+++ b/host_vars/vpn01/vars.yml
@@ -27,34 +27,31 @@ wireguard_unmanaged_peers:
   vpn2-Kabel-Waechter:
     public_key: IuU88/zIE5fsSi3gN68vmz/72iJadOgip3I+lCOo5hk=
     allowed_ips: 10.255.1.2/32, 10.2.0.0/16, fd80:3ea2:e399:203a::2/128, 2a03:2260:121:602::/64
-    persistent_keepalive: 25
   ## Ticket #521263
   vpn3-FFRS-VPN:
     public_key: 0T+vKvbB94SkUgjw9Y4wiOKp7eJQ6IFNeY7sve/F0Ag=
     allowed_ips: 10.255.1.3/32, 10.3.0.0/16, fd80:3ea2:e399:203a::3/128, 2a03:2260:121:603::/64
-    persistent_keepalive: 25
   ## Ticket #150439
   vpn4-sg:
     public_key: IarM0mG08rfZ1k8d557H49nqRK6mKUrVuffhm8QYN1Q=
     allowed_ips: 10.255.1.4/32, 10.4.0.0/16, fd80:3ea2:e399:203a::4/128, 2a03:2260:121:604::/64
-    persistent_keepalive: 25
   ## ERX-Testing Stefan
   vpn6-stefan:
     public_key: KxjuZJs7aIPFAUm/J5iw/oWiv4O44hjpnnfN+VN0iQ0=
     allowed_ips: 10.255.1.7/32, 10.7.0.0/16, fd80:3ea2:e399:203a::7/128, 2a03:2260:121:607::/64
-    persistent_keepalive: 25
   ## Nils
   vpn8-nils:
-    public_key: qeNX6KIX629tebqUuCvPUEF48z0y10VT7KtdcXS9NEY=
+    public_key: g+l9gP3SR99Q8TZ3uKs7yu1mANy97EFA21THrC/n1W0=
     allowed_ips: 10.255.1.8/32, 10.8.0.0/16, fd80:3ea2:e399:203a::8/128, 2a03:2260:121:608::/64
-    persistent_keepalive: 25
   ## edge3
   vpn9-edge3:
     public_key: pUBPZFl9VGb1zLseKenGS7pvOLWuWQNJdDEpHtOsxlg=
     allowed_ips: 10.255.1.9/32, 10.9.0.0/16, fd80:3ea2:e399:203a::9/128, 2a03:2260:121:609::/64
-    persistent_keepalive: 25
   ## edge4
   vpn10-edge4:
     public_key: 2Cq7gW5mSTcOJGzvw4dvdERhAFx3EIga5Ftds9zKlT8=
     allowed_ips: 10.255.1.10/32, 10.10.0.0/16, fd80:3ea2:e399:203a::10/128, 2a03:2260:121:60a::/64
-    persistent_keepalive: 25
+  ## Stefan_Test
+  vpn10-edge4:
+    public_key: UHaYitx18sO71Ssk2SVUgdjLaAILbCthCmosU+Fs5Es=
+    allowed_ips: 10.255.1.11/32, 10.11.0.0/16, fd80:3ea2:e399:203a::11/128, 2a03:2260:121:60b::/64
diff --git a/host_vars/vpn02/vars.yml b/host_vars/vpn02/vars.yml
new file mode 100644
index 0000000..d5044d9
--- /dev/null
+++ b/host_vars/vpn02/vars.yml
@@ -0,0 +1,30 @@
+ansible_host: 5.9.220.115
+ansible_port: 22
+ansible_ssh_user: root
+ansible_python_interpreter: /usr/bin/python3
+
+###
+### Vars Freifunk
+###
+internal_network: "10.255.0.0/16"
+freifunk_internal_ip: 172.16.7.11/24
+core_router: 172.16.7.1
+
+###
+### Wireguard
+###
+ipv6_network: 2a03:2260:121:640::/58
+wireguard_address: "10.255.1.1/24, fd80:3ea2:e399:203a::1/64"
+wireguard_port: 42001
+wireguard_public: 5B/YTaDPVWVApUyHshJp899iXXlBy8rBqJUpYvKo+1s=
+wiregurad_v4: 10.255.1.1
+
+wireguard_unmanaged_peers:
+  ## Nils
+  vpn8-nils:
+    public_key: g+l9gP3SR99Q8TZ3uKs7yu1mANy97EFA21THrC/n1W0=
+    allowed_ips: 10.255.1.2/32, 10.2.0.0/16, fd80:3ea2:e399:203a::2/128, 2a03:2260:121:642::/64
+  ## Stefan_Test
+  vpn10-edge4:
+    public_key: UHaYitx18sO71Ssk2SVUgdjLaAILbCthCmosU+Fs5Es=
+    allowed_ips: 10.255.1.11/32, 10.11.0.0/16, fd80:3ea2:e399:203a::11/128, 2a03:2260:121:64b::/64
\ No newline at end of file
diff --git a/host_vars/vpn02/vault.yml b/host_vars/vpn02/vault.yml
new file mode 100644
index 0000000..963615a
--- /dev/null
+++ b/host_vars/vpn02/vault.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+31653333646534336164323064616261666365636438363761663837663635613333386165313962
+3732656532643062333235366564333633623937353335650a343334393265316131313935363337
+61323339356237646631303039646132663161623739393130383338383339373063373566666330
+3463346562336166340a313562613835386431613636303637626133346433393630623837646236
+66633239393134336539346430343965383339653061633463653864653834633862353861663432
+39633663663833373264623138376431353437623765643530373266643539616231376162663831
+33643334323861653564333739376561306462316561336531656663396134336635666639343433
+38613630313731343736