diff --git a/homelab/server/config/wireguard/docker-compose.yml b/homelab/server/config/wireguard/docker-compose.yml
index 325e4f76..894391d4 100644
--- a/homelab/server/config/wireguard/docker-compose.yml
+++ b/homelab/server/config/wireguard/docker-compose.yml
@@ -13,10 +13,8 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     env_file:
-      - ./project.env
-      #- ../../../homelab.env
-      #- ../../host.env
-      
+      - wireguard.env
+      - wireguard_secrets.env
     ports:
       - 53820:51820/udp
     networks:
diff --git a/homelab/server/config/wireguard/project.env b/homelab/server/config/wireguard/project.env
deleted file mode 100644
index 5a92c2fe..00000000
--- a/homelab/server/config/wireguard/project.env
+++ /dev/null
@@ -1,8 +0,0 @@
-# Independent prject variables
-#PASSWORD=***REMOVED***
-WG_HOST=vpn.jafner.net
-WG_PORT=53820
-WG_DEFAULT_DNS=192.168.1.1
-
-# Inherit and modify
-DOCKER_DATA=${DOCKER_DATA}/wireguard
\ No newline at end of file
diff --git a/homelab/server/config/wireguard/.env b/homelab/server/config/wireguard/wireguard.env
similarity index 63%
rename from homelab/server/config/wireguard/.env
rename to homelab/server/config/wireguard/wireguard.env
index 1585d987..eadf8fe2 100644
--- a/homelab/server/config/wireguard/.env
+++ b/homelab/server/config/wireguard/wireguard.env
@@ -1,4 +1,7 @@
+# Volumes
 DOCKER_DATA=/home/joey/data/wireguard
+
+# Env
 WG_HOST=vpn.jafner.net
 WG_PORT=53820
-WG_DEFAULT_DNS=192.168.1.1
+WG_DEFAULT_DNS=192.168.1.1
\ No newline at end of file
diff --git a/homelab/server/config/wireguard/wireguard_secrets.env b/homelab/server/config/wireguard/wireguard_secrets.env
new file mode 100644
index 00000000..5f4f9626
--- /dev/null
+++ b/homelab/server/config/wireguard/wireguard_secrets.env
@@ -0,0 +1 @@
+PASSWORD=***REMOVED***
\ No newline at end of file