diff --git a/server/config/plex/.env b/server/config/plex/.env
deleted file mode 100644
index 235f50f..0000000
--- a/server/config/plex/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-DOCKER_DATA=/home/joey/data/plex
-MEDIA_DIR=/mnt/nas/media
diff --git a/server/config/plex/docker-compose.yml b/server/config/plex/docker-compose.yml
index c8d3ae5..2477b99 100644
--- a/server/config/plex/docker-compose.yml
+++ b/server/config/plex/docker-compose.yml
@@ -32,15 +32,10 @@ services:
       - 32412:32412/udp
       - 32413:32413/udp
       - 32414:32414/udp
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - VERSION=latest
-      - ADVERTISE_IP="https://plex.jafner.net:443"
-      - PLEX_CLAIM=claim-nSxzt4MT2j7mExwhhrnZ
-      - NVIDIA_VISIBLE_DEVICES=all
     env_file:
-      - .env
+      - plex_stack.env
+      - plex.env
+      - plex_secrets.env
     volumes:
       - "${MEDIA_DIR}/Video/Movies:/movies"
       - "${MEDIA_DIR}/Video/Shows:/shows"
@@ -64,12 +59,8 @@ services:
     restart: "no"
     networks:
       - web
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Los_Angeles
     env_file:
-      - .env
+      - plex_stack.env
     volumes:
       - "${DOCKER_DATA}/ombi:/config"
     labels:
diff --git a/server/config/plex/plex.env b/server/config/plex/plex.env
new file mode 100644
index 0000000..33ffb7a
--- /dev/null
+++ b/server/config/plex/plex.env
@@ -0,0 +1,3 @@
+VERSION=latest
+ADVERTISE_IP="https://plex.jafner.net:443"
+NVIDIA_VISIBLE_DEVICES=all
\ No newline at end of file
diff --git a/server/config/plex/plex_secrets.env b/server/config/plex/plex_secrets.env
new file mode 100644
index 0000000..428abc4
--- /dev/null
+++ b/server/config/plex/plex_secrets.env
@@ -0,0 +1 @@
+PLEX_CLAIM=claim-nSxzt4MT2j7mExwhhrnZ
\ No newline at end of file
diff --git a/server/config/plex/plex_stack.env b/server/config/plex/plex_stack.env
new file mode 100644
index 0000000..1c95a19
--- /dev/null
+++ b/server/config/plex/plex_stack.env
@@ -0,0 +1,8 @@
+# Volumes
+DOCKER_DATA=/home/joey/data/plex
+MEDIA_DIR=/mnt/nas/media
+
+# Env
+PUID=1000
+PGID=1000
+TZ=America/Los_Angeles
\ No newline at end of file
diff --git a/server/config/plex/project.env b/server/config/plex/project.env
deleted file mode 100644
index e69de29..0000000