diff --git a/server/config/autopirate/.env b/server/config/autopirate/autopirate.env
similarity index 92%
rename from server/config/autopirate/.env
rename to server/config/autopirate/autopirate.env
index 4a7ea2c..21bec4f 100644
--- a/server/config/autopirate/.env
+++ b/server/config/autopirate/autopirate.env
@@ -1,10 +1,11 @@
+# Volumes
 DOCKER_DATA=/home/joey/data/autopirate
 MEDIA_DIR=/mnt/nas/media
 NZB_DIR=/mnt/md0/torrenting/NZB
 INCOMPLETE_NZB_DIR=/mnt/md0/torrenting/NZB_incomplete
 TRANSCODE_DIR=/mnt/md0/tdarr
 
-## Generic
+## Env
 TZ=America/Los_Angeles
 PUID=1000
 PGID=1000
\ No newline at end of file
diff --git a/server/config/autopirate/docker-compose.yml b/server/config/autopirate/docker-compose.yml
index 74d51e7..be3f8f2 100644
--- a/server/config/autopirate/docker-compose.yml
+++ b/server/config/autopirate/docker-compose.yml
@@ -13,10 +13,8 @@ services:
         keep-file: "true"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - autopirate.env
     volumes:
       - "${MEDIA_DIR}/Video/Movies:/movies"
       - "${DOCKER_DATA}/radarr_config:/config"
@@ -40,10 +38,8 @@ services:
         keep-file: "true"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - autopirate.env
     volumes:
       - "${MEDIA_DIR}/Video/Shows:/shows"
       - "${DOCKER_DATA}/sonarr_config:/config"
@@ -67,10 +63,8 @@ services:
         keep-file: "true"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - autopirate.env
     volumes:
       - "${DOCKER_DATA}/lidarr:/config"
       - "${NZB_DIR}:/downloads"
@@ -94,10 +88,8 @@ services:
         keep-file: "true"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - autopirate.env
     volumes:
       - "${DOCKER_DATA}/nzbhydra2_config:/config"
       - "${NZB_DIR}:/downloads"
@@ -121,10 +113,8 @@ services:
     networks:
       - web
       - monitoring
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
+    env_file:
+      - autopirate.env
     ports:
       - 8085:8080
     volumes:
@@ -161,14 +151,9 @@ services:
       - traefik.http.routers.tdarr.tls.certresolver=lets-encrypt
       - traefik.http.routers.tdarr.middlewares=lan-only@file,traefik-forward-auth@file
       - traefik.http.services.tdarr.loadbalancer.server.port=8265
-    environment:
-      - TZ=${TZ}
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - UMASK_SET=002
-      - serverIP=0.0.0.0
-      - serverPort=8266
-      - webUIPort=8265
+    env_file:
+      - autopirate.env
+      - tdarr.env
     volumes:
       - ${DOCKER_DATA}/tdarr/server:/app/server
       - ${DOCKER_DATA}/tdarr/configs:/app/configs
@@ -200,18 +185,9 @@ services:
     networks:
       tdarr:
         ipv4_address: 172.110.0.20
-    environment:
-      - TZ=${TZ}
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - UMASK_SET=002
-      - nodeID=MainNode
-      - nodeIP=172.110.0.20
-      - nodePort=8267
-      - serverIP=172.110.0.10
-      - serverPort=8266
-      - NVIDIA_VISIBLE_DEVICES=all
-      - NVIDIA_DRIVER_CAPABILITIES=all
+    env_file:
+      - autopirate.env
+      - tdarr_node.env
     volumes:
       - ${DOCKER_DATA}/tdarr/configs:/app/configs
       - ${DOCKER_DATA}/tdarr/logs:/app/logs
@@ -232,11 +208,9 @@ services:
         keep-file: "true"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
-      - AUTO_UPDATE=false
+    env_file:
+      - autopirate.env
+      - jackett.env
     volumes:
       - "${DOCKER_DATA}/jackett_config:/config"
       - "${NZB_DIR}:/downloads"
diff --git a/server/config/autopirate/jackett.env b/server/config/autopirate/jackett.env
new file mode 100644
index 0000000..48182e1
--- /dev/null
+++ b/server/config/autopirate/jackett.env
@@ -0,0 +1 @@
+AUTO_UPDATE=false
\ No newline at end of file
diff --git a/server/config/autopirate/project.env b/server/config/autopirate/project.env
deleted file mode 100644
index e69de29..0000000
diff --git a/server/config/autopirate/tdarr.env b/server/config/autopirate/tdarr.env
new file mode 100644
index 0000000..02145f6
--- /dev/null
+++ b/server/config/autopirate/tdarr.env
@@ -0,0 +1,4 @@
+UMASK_SET=002
+serverIP=0.0.0.0
+serverPort=8266
+webUIPort=8265
\ No newline at end of file
diff --git a/server/config/autopirate/tdarr_node.env b/server/config/autopirate/tdarr_node.env
new file mode 100644
index 0000000..3d2edba
--- /dev/null
+++ b/server/config/autopirate/tdarr_node.env
@@ -0,0 +1,8 @@
+UMASK_SET=002
+nodeID=MainNode
+nodeIP=172.110.0.20
+nodePort=8267
+serverIP=172.110.0.10
+serverPort=8266
+NVIDIA_VISIBLE_DEVICES=all
+NVIDIA_DRIVER_CAPABILITIES=all
\ No newline at end of file