diff --git a/jafner-tools/config/vaultwarden/.env b/jafner-tools/config/vaultwarden/.env
index 981de9f..011fa32 100644
--- a/jafner-tools/config/vaultwarden/.env
+++ b/jafner-tools/config/vaultwarden/.env
@@ -1,2 +1 @@
 DOCKER_DATA=/home/admin/data/vaultwarden
-ADMIN_TOKEN=7YK43TxKdHNqb696GPNibAvrindZxE7m6nbDsx3purhkgRsRReUiDXPw4HTSBrVN
diff --git a/jafner-tools/config/vaultwarden/docker-compose.yml b/jafner-tools/config/vaultwarden/docker-compose.yml
index 126ddb5..cce5c68 100644
--- a/jafner-tools/config/vaultwarden/docker-compose.yml
+++ b/jafner-tools/config/vaultwarden/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: vaultwarden_vaultwarden
     restart: "no"
     env_file:
-      - .env
+      - vaultwarden_secrets.env
     networks:
       - web
     volumes:
diff --git a/jafner-tools/config/wireguard/.env b/jafner-tools/config/wireguard/.env
index 6455d93..a9d2148 100644
--- a/jafner-tools/config/wireguard/.env
+++ b/jafner-tools/config/wireguard/.env
@@ -1,5 +1 @@
 DOCKER_DATA=/home/admin/data/wireguard
-PASSWORD=7IoEvL8y4eDWBDeLPwUR322Q2A6TNWGH
-WG_HOST=vpn.jafner.tools
-WG_PORT=53820
-WG_DEFAULT_DNS=1.1.1.1
diff --git a/jafner-tools/config/wireguard/docker-compose.yml b/jafner-tools/config/wireguard/docker-compose.yml
index 0269a64..3c2e7d2 100644
--- a/jafner-tools/config/wireguard/docker-compose.yml
+++ b/jafner-tools/config/wireguard/docker-compose.yml
@@ -5,7 +5,8 @@ services:
     container_name: wireguard_wg-easy
     restart: "no"
     env_file:
-      - .env
+      - wireguard.env
+      - wireguard_secrets.env
     ports:
       - 53820:51820/udp
     networks:
diff --git a/jafner-tools/config/wireguard/wireguard.env b/jafner-tools/config/wireguard/wireguard.env
new file mode 100644
index 0000000..b4c33a7
--- /dev/null
+++ b/jafner-tools/config/wireguard/wireguard.env
@@ -0,0 +1,3 @@
+WG_HOST=vpn.jafner.tools
+WG_PORT=53820
+WG_DEFAULT_DNS=1.1.1.1
\ No newline at end of file