diff --git a/server/config/autopirate/.env b/server/config/autopirate/.env
new file mode 100644
index 0000000..e74c430
--- /dev/null
+++ b/server/config/autopirate/.env
@@ -0,0 +1,5 @@
+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
\ No newline at end of file
diff --git a/server/config/autopirate/autopirate.env b/server/config/autopirate/autopirate.env
index 21bec4f..58e58df 100644
--- a/server/config/autopirate/autopirate.env
+++ b/server/config/autopirate/autopirate.env
@@ -1,11 +1,3 @@
-# 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
-
-## Env
 TZ=America/Los_Angeles
 PUID=1000
 PGID=1000
\ No newline at end of file
diff --git a/server/config/calibre-web/.env b/server/config/calibre-web/.env
new file mode 100644
index 0000000..baaa226
--- /dev/null
+++ b/server/config/calibre-web/.env
@@ -0,0 +1 @@
+LIBRARY_DIR=/mnt/nas/calibre-web
\ No newline at end of file
diff --git a/server/config/calibre-web/calibre-web.env b/server/config/calibre-web/calibre-web.env
index e448031..248f7ce 100644
--- a/server/config/calibre-web/calibre-web.env
+++ b/server/config/calibre-web/calibre-web.env
@@ -1,7 +1,3 @@
-# Volumes
-LIBRARY_DIR=/mnt/nas/calibre-web
-
-# Env
 PUID=1000
 PGID=1000
 TZ=America/Los_Angeles
\ No newline at end of file
diff --git a/server/config/fireshare/.env b/server/config/fireshare/.env
new file mode 100644
index 0000000..c244e31
--- /dev/null
+++ b/server/config/fireshare/.env
@@ -0,0 +1,3 @@
+VIDEO_DIR=/mnt/nas/media/Video/Recordings/Fireshare
+DATA_DIR=/home/joey/data/fireshare/db
+PROCESSED_DIR=/home/joey/data/fireshare/metadata
\ No newline at end of file
diff --git a/server/config/fireshare/fireshare.env b/server/config/fireshare/fireshare.env
index 0f7ec40..01fd258 100644
--- a/server/config/fireshare/fireshare.env
+++ b/server/config/fireshare/fireshare.env
@@ -1,9 +1,3 @@
-# Volumes
-VIDEO_DIR=/mnt/nas/media/Video/Recordings/Fireshare
-DATA_DIR=/home/joey/data/fireshare/db
-PROCESSED_DIR=/home/joey/data/fireshare/metadata
-
-# Env
 ADMIN_USERNAME=joey
 MINUTES_BETWEEN_VIDEO_SCANS=10
 PUID=1000
diff --git a/server/config/gitlab/gitlab.env b/server/config/gitlab/.env
similarity index 88%
rename from server/config/gitlab/gitlab.env
rename to server/config/gitlab/.env
index 63060dd..96d7bf5 100644
--- a/server/config/gitlab/gitlab.env
+++ b/server/config/gitlab/.env
@@ -1,3 +1,2 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/gitlab
 DOCKER_CONFIG=/home/joey/docker_config/gitlab
\ No newline at end of file
diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index 6168700..6d1d0a3 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -15,8 +15,6 @@ services:
     hostname: 'gitlab.jafner.net'
     networks:
       - web
-    env_file:
-      - gitlab.env
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://gitlab.jafner.net'
@@ -106,7 +104,6 @@ services:
         keep-file: "true"
     restart: "no"
     env_file:
-      - gitlab.env
       - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
@@ -127,7 +124,6 @@ services:
         keep-file: "true"
     restart: "no"
     env_file:
-      - gitlab.env
       - runner.env
     volumes:
       - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
diff --git a/server/config/jdownloader2/.env b/server/config/jdownloader2/.env
new file mode 100644
index 0000000..68d3733
--- /dev/null
+++ b/server/config/jdownloader2/.env
@@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/jdownloader2
+DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
\ No newline at end of file
diff --git a/server/config/jdownloader2/jdownloader2.env b/server/config/jdownloader2/jdownloader2.env
index efe8a38..4a5fde1 100644
--- a/server/config/jdownloader2/jdownloader2.env
+++ b/server/config/jdownloader2/jdownloader2.env
@@ -1,6 +1 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/jdownloader2
-DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
-
-# Env
 TZ=America/Los_Angeles
\ No newline at end of file
diff --git a/server/config/keycloak/.env b/server/config/keycloak/.env
new file mode 100644
index 0000000..bafbbae
--- /dev/null
+++ b/server/config/keycloak/.env
@@ -0,0 +1 @@
+KEYCLOAK_DATA="/home/joey/data/keycloak/data"
\ No newline at end of file
diff --git a/server/config/keycloak/keycloak.env b/server/config/keycloak/keycloak.env
index 328418f..9bdb217 100644
--- a/server/config/keycloak/keycloak.env
+++ b/server/config/keycloak/keycloak.env
@@ -1,5 +1 @@
-# Volumes
-KEYCLOAK_DATA="/home/joey/data/keycloak/data"
-
-# Env
 KEYCLOAK_ADMIN="jafner"
\ No newline at end of file
diff --git a/server/config/megan-portfolio/project.env b/server/config/megan-portfolio/.env
similarity index 81%
rename from server/config/megan-portfolio/project.env
rename to server/config/megan-portfolio/.env
index aa48f19..754e660 100644
--- a/server/config/megan-portfolio/project.env
+++ b/server/config/megan-portfolio/.env
@@ -1,2 +1 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/megan-portfolio
\ No newline at end of file
diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml
index f5733cc..58d678d 100644
--- a/server/config/megan-portfolio/docker-compose.yml
+++ b/server/config/megan-portfolio/docker-compose.yml
@@ -6,7 +6,6 @@ services:
     container_name: wordpress_megan-portfolio
     restart: "no"
     env_file:
-      - project.env
       - megan-portfolio.env
     volumes:
       - ${DOCKER_DATA}/html:/var/www/html
@@ -27,7 +26,6 @@ services:
     networks:
       - portfolio
     env_file:
-      - project.env
       - megan-portfolio-db.env
     volumes:
       - ${DOCKER_DATA}/db:/var/lib/mysql
diff --git a/server/config/minecraft/.env b/server/config/minecraft/.env
new file mode 100644
index 0000000..f5cd4f3
--- /dev/null
+++ b/server/config/minecraft/.env
@@ -0,0 +1,2 @@
+DOCKER_DATA=/mnt/md0/minecraft
+DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
\ No newline at end of file
diff --git a/server/config/minecraft/minecraft.env b/server/config/minecraft/minecraft.env
index fb9ed71..196d3b7 100644
--- a/server/config/minecraft/minecraft.env
+++ b/server/config/minecraft/minecraft.env
@@ -1,8 +1,3 @@
-# Volumes
-DOCKER_DATA=/mnt/md0/minecraft
-DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
-
-# Env
 EULA=TRUE
 OPS=jafner425,mollymsmom,galaxysqvid
 ENABLE_RCON=true
diff --git a/server/config/monitoring/monitoring.env b/server/config/monitoring/.env
similarity index 79%
rename from server/config/monitoring/monitoring.env
rename to server/config/monitoring/.env
index 049d22d..32c75a0 100644
--- a/server/config/monitoring/monitoring.env
+++ b/server/config/monitoring/.env
@@ -1,2 +1 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/monitoring
\ No newline at end of file
diff --git a/server/config/monitoring/docker-compose.yml b/server/config/monitoring/docker-compose.yml
index 9aae1f6..c5d58b8 100644
--- a/server/config/monitoring/docker-compose.yml
+++ b/server/config/monitoring/docker-compose.yml
@@ -16,8 +16,6 @@ services:
       - monitoring
       - web
     user: "0"
-    env_file:
-      - monitoring.env
     volumes:  
       - ${DOCKER_DATA}/grafana:/var/lib/grafana
       - ./custom.ini:/etc/grafana/grafana.ini
@@ -43,8 +41,6 @@ services:
       - web
     ports:
       - 9090:9090
-    env_file:
-      - monitoring.env
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - ${DOCKER_DATA}/prometheus:/prometheus
@@ -73,8 +69,6 @@ services:
       - web
     ports:
       - "3100:3100"
-    env_file:
-      - monitoring.env
     volumes:
       - ${DOCKER_DATA}/loki-logs:/loki-logs
       - ./loki-config.yml:/etc/loki/loki-config.yml # not sure if this works. If not, just edit the config within the data volume
@@ -115,7 +109,7 @@ services:
         keep-file: "true"
     restart: "no"
     networks:
-      -   monitoring
+      - monitoring
     env_file:
       - exporter-pihole.env
     labels:
diff --git a/server/config/plex/.env b/server/config/plex/.env
new file mode 100644
index 0000000..05ab340
--- /dev/null
+++ b/server/config/plex/.env
@@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/plex
+MEDIA_DIR=/mnt/nas/media
\ No newline at end of file
diff --git a/server/config/plex/plex_stack.env b/server/config/plex/plex_stack.env
index 1c95a19..248f7ce 100644
--- a/server/config/plex/plex_stack.env
+++ b/server/config/plex/plex_stack.env
@@ -1,8 +1,3 @@
-# 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/qbittorrent/.env b/server/config/qbittorrent/.env
new file mode 100644
index 0000000..7e89169
--- /dev/null
+++ b/server/config/qbittorrent/.env
@@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/qbittorrent
+TORRENT_DATA=/mnt/nas/torrenting
\ No newline at end of file
diff --git a/server/config/qbittorrent/qbittorrent.env b/server/config/qbittorrent/qbittorrent.env
index 5031a73..b3c97e3 100644
--- a/server/config/qbittorrent/qbittorrent.env
+++ b/server/config/qbittorrent/qbittorrent.env
@@ -1,8 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/qbittorrent
-TORRENT_DATA=/mnt/nas/torrenting
-
-# Env
 PUID=1000
 PGID=1000
 TZ=America/Los_Angeles
diff --git a/server/config/send/.env b/server/config/send/.env
new file mode 100644
index 0000000..d9f7c04
--- /dev/null
+++ b/server/config/send/.env
@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/send
\ No newline at end of file
diff --git a/server/config/send/send.env b/server/config/send/send.env
index c0257e0..99529cf 100644
--- a/server/config/send/send.env
+++ b/server/config/send/send.env
@@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/send
-
-# Env
 VIRTUAL_HOST=0.0.0.0
 VIRTUAL_PORT=1234
 DHPARAM_GENERATION=false
diff --git a/server/config/sftp/sftp.env b/server/config/sftp/.env
similarity index 100%
rename from server/config/sftp/sftp.env
rename to server/config/sftp/.env
diff --git a/server/config/sftp/docker-compose.yml b/server/config/sftp/docker-compose.yml
index e6f981a..f9a594d 100644
--- a/server/config/sftp/docker-compose.yml
+++ b/server/config/sftp/docker-compose.yml
@@ -12,8 +12,6 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    env_file:
-      - sftp.env
     ports:
       - 23450:22/tcp
     volumes:
diff --git a/server/config/stashapp/.env b/server/config/stashapp/.env
new file mode 100644
index 0000000..c8f43a8
--- /dev/null
+++ b/server/config/stashapp/.env
@@ -0,0 +1,3 @@
+MEDIA_DIR=/mnt/nas/av/
+METADATA_DIR=/mnt/md0/
+DOCKER_DATA=/home/joey/data/stash
\ No newline at end of file
diff --git a/server/config/stashapp/stashapp.env b/server/config/stashapp/stashapp.env
index 4bce97d..c139ab8 100644
--- a/server/config/stashapp/stashapp.env
+++ b/server/config/stashapp/stashapp.env
@@ -1,9 +1,3 @@
-# Volumes
-MEDIA_DIR=/mnt/nas/av/
-METADATA_DIR=/mnt/md0/
-DOCKER_DATA=/home/joey/data/stash
-
-# Env
 STASH_STASH=/media/
 STASH_GENERATED=/generated/
 STASH_METADATA=/metadata/
diff --git a/server/config/traefik/traefik.env b/server/config/traefik/.env
similarity index 100%
rename from server/config/traefik/traefik.env
rename to server/config/traefik/.env
diff --git a/server/config/traefik/docker-compose.yml b/server/config/traefik/docker-compose.yml
index 773e1e5..679a4ed 100644
--- a/server/config/traefik/docker-compose.yml
+++ b/server/config/traefik/docker-compose.yml
@@ -13,8 +13,6 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
-    env_file:
-      - traefik.env
     networks:
       - web
       - monitoring
diff --git a/server/config/unifi_controller/.env b/server/config/unifi_controller/.env
new file mode 100644
index 0000000..24003df
--- /dev/null
+++ b/server/config/unifi_controller/.env
@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/unifi_controller
\ No newline at end of file
diff --git a/server/config/unifi_controller/unifi_controller.env b/server/config/unifi_controller/unifi_controller.env
index 30ae4db..a705f72 100644
--- a/server/config/unifi_controller/unifi_controller.env
+++ b/server/config/unifi_controller/unifi_controller.env
@@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/unifi_controller
-
-# Env
 PUID=1000
 PGID=1000
 MEM_LIMIT=1024M
diff --git a/server/config/wireguard/.env b/server/config/wireguard/.env
new file mode 100644
index 0000000..ae1bcc2
--- /dev/null
+++ b/server/config/wireguard/.env
@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/wireguard
\ No newline at end of file
diff --git a/server/config/wireguard/wireguard.env b/server/config/wireguard/wireguard.env
index eadf8fe..6abe064 100644
--- a/server/config/wireguard/wireguard.env
+++ b/server/config/wireguard/wireguard.env
@@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/wireguard
-
-# Env
 WG_HOST=vpn.jafner.net
 WG_PORT=53820
 WG_DEFAULT_DNS=192.168.1.1
\ No newline at end of file