diff --git a/homelab/server/config/ddns/.env b/homelab/server/config/ddns/.env
deleted file mode 100644
index 5d781d4f..00000000
--- a/homelab/server/config/ddns/.env
+++ /dev/null
@@ -1 +0,0 @@
-DOCKER_DATA=/home/joey/data/ddns
\ No newline at end of file
diff --git a/homelab/server/config/ddns/cloudflare.env b/homelab/server/config/ddns/cloudflare.env
new file mode 100644
index 00000000..3c4e3768
--- /dev/null
+++ b/homelab/server/config/ddns/cloudflare.env
@@ -0,0 +1,2 @@
+ZONE=jafner.net
+SUBDOMAIN=*
\ No newline at end of file
diff --git a/homelab/server/config/ddns/cloudflare_secrets.env b/homelab/server/config/ddns/cloudflare_secrets.env
new file mode 100644
index 00000000..4932e319
--- /dev/null
+++ b/homelab/server/config/ddns/cloudflare_secrets.env
@@ -0,0 +1 @@
+API_KEY=***REMOVED***
\ No newline at end of file
diff --git a/homelab/server/config/ddns/ddclient.env b/homelab/server/config/ddns/ddclient.env
new file mode 100644
index 00000000..248f7ce8
--- /dev/null
+++ b/homelab/server/config/ddns/ddclient.env
@@ -0,0 +1,3 @@
+PUID=1000
+PGID=1000
+TZ=America/Los_Angeles
\ No newline at end of file
diff --git a/homelab/server/config/ddns/docker-compose.yml b/homelab/server/config/ddns/docker-compose.yml
index 4f3d050e..19af96ee 100644
--- a/homelab/server/config/ddns/docker-compose.yml
+++ b/homelab/server/config/ddns/docker-compose.yml
@@ -12,10 +12,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - API_KEY=***REMOVED***
-      - ZONE=jafner.net
-      - SUBDOMAIN=*
+    env_file:
+      - cloudflare.env
+      - cloudflare_secrets.env
     labels:
       - traefik.enable=false
   ddclient:
@@ -30,11 +29,9 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - ddclient.env
     volumes:
-      - ${PWD}/ddclient:/config
+      - ./ddclient:/config
     labels:
       - traefik.enable=false
diff --git a/homelab/server/config/ddns/project.env b/homelab/server/config/ddns/project.env
deleted file mode 100644
index e69de29b..00000000