diff --git a/copyparty/.env b/copyparty/.env
index 89dd86b..f0f6343 100644
--- a/copyparty/.env
+++ b/copyparty/.env
@@ -1,2 +1,5 @@
 # What directory copyparty will see
 DATA_MOUNT_LOCATION=/srv/copyparty
+
+PUID=1000
+PGID=1000
diff --git a/copyparty/docker-compose.yml b/copyparty/docker-compose.yml
index ff4de07..84c47aa 100644
--- a/copyparty/docker-compose.yml
+++ b/copyparty/docker-compose.yml
@@ -1,10 +1,9 @@
 ---
-
 services:
   copyparty:
     image: copyparty/ac:latest
     container_name: copyparty
-    user: "1000:1000"
+    user: ${PUID}:${PGID}
     env_file:
       .env
     ports:
diff --git a/gameyfin/.env b/gameyfin/.env
index b790f54..6910abb 100644
--- a/gameyfin/.env
+++ b/gameyfin/.env
@@ -10,3 +10,4 @@ PORT=8095
 
 # Location of game files (can be multiple subdirectories: /srv/games -> /srv/games/steam & /srv/games/nintendo)
 GAMES_DIR_LOCATION=/srv/gameyfin/games
+GAMEYFIN_DATA_LOCATION=./gameyfin
diff --git a/gameyfin/docker-compose.yml b/gameyfin/docker-compose.yml
index 7a0b0da..a5dcaf8 100644
--- a/gameyfin/docker-compose.yml
+++ b/gameyfin/docker-compose.yml
@@ -6,10 +6,10 @@ services:
     env_file:
       .env
     volumes:
-      - "./gameyfin/db:/opt/gameyfin/db"
-      - "./gameyfin/data:/opt/gameyfin/data"
-      - "./gameyfin/plugindata:/opt/gameyfin/plugindata"
-      - "./gameyfin/logs:/opt/gameyfin/logs"
+      - ${GAMEYFIN_DATA_LOCATION}/db:/opt/gameyfin/db
+      - ${GAMEYFIN_DATA_LOCATION}/data:/opt/gameyfin/data
+      - ${GAMEYFIN_DATA_LOCATION}/plugindata:/opt/gameyfin/plugindata
+      - ${GAMEYFIN_DATA_LOCATION}/logs:/opt/gameyfin/logs
       - ${GAMES_DIR_LOCATION}:/opt/gameyfin/games
     ports:
       - ${PORT}:8080
diff --git a/hoodik/.env b/hoodik/.env
index cbb0a99..5ab4b7f 100644
--- a/hoodik/.env
+++ b/hoodik/.env
@@ -6,3 +6,6 @@ HOODIK_DATA_DIR=/srv/hoodik
 
 # Publised hoodik URL (optional maybe? idk)
 APP_URL=https://hoodik.change.me
+
+# Don't change, this is how hoodik finds the data inside the container
+DATA_DIR=/data
diff --git a/hoodik/docker-compose.yml b/hoodik/docker-compose.yml
index 4c75314..9c56767 100644
--- a/hoodik/docker-compose.yml
+++ b/hoodik/docker-compose.yml
@@ -5,8 +5,6 @@ services:
         restart: unless-stopped
         env_file:
           .env
-        environment:
-            - DATA_DIR=/data
         volumes:
             - ${HOODIK_DATA_DIR}:/data
         ports:
diff --git a/neoforge/docker-compose.yml b/neoforge/docker-compose.yml
index 48c40c4..ccea3c7 100644
--- a/neoforge/docker-compose.yml
+++ b/neoforge/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       VERSION: 1.21.1
       NEOFORGE_VERSION: latest
     ports:
-      - "7777:7777"  # Replace with game ports
+      - "25565:25565"     # Default mc server ports
       #- "9987:9987/udp"  # For voicemod (optional)
     volumes:
       - ./mc:/data
diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml
index cdf8086..025e176 100644
--- a/portainer/docker-compose.yml
+++ b/portainer/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - portainer_data:/data
+      - ./portainer_data:/data
     ports:
       - 9443:9443
 
diff --git a/portal-runner-convert/docker-compose.yml b/portal-runner-convert/docker-compose.yml
index 6d8411c..17c4e8a 100644
--- a/portal-runner-convert/docker-compose.yml
+++ b/portal-runner-convert/docker-compose.yml
@@ -2,5 +2,5 @@ services:
   convert:
     image: ghcr.io/${GITHUB_REPOSITORY:-p2r3/convert}:${CONVERT_IMAGE_TAG:-latest}
     ports:
-      - 3030:80
+      - 80:80
     restart: unless-stopped
diff --git a/rstack/.env b/rstack/.env
index a1e21dd..dd593df 100644
--- a/rstack/.env
+++ b/rstack/.env
@@ -4,7 +4,7 @@
 WIREGUARD_PRIVATE_KEY=
 WIREGUARD_ADDRESSES=
 # Example:
-# WIREGUARD_PRIVATE_KEY=asdfasdfasdfasdfasdfasdf=
+# WIREGUARD_PRIVATE_KEY=asdfasdfasdfasdfasdfasdf=   <---- Will have a "=" at the end
 # WIREGUARD_ADDRESSES=10.51.83.12/32
 
 RSTACK_DATA_DIR=/srv/rstack/
diff --git a/rstack/docker-compose.yml b/rstack/docker-compose.yml
index 05d8192..719b538 100644
--- a/rstack/docker-compose.yml
+++ b/rstack/docker-compose.yml
@@ -13,8 +13,6 @@ services:
     devices:
       - /dev/net/tun:/dev/net/tun
     ports:
-      - 6881:6881
-      - 6881:6881/udp
       - 8085:8085   # qbittorrent       Downloads torrents and sorts them by categories
       - 9696:9696   # Prowlarr          Torrent indexer (searches pirate bay and other sites for torrent files)
       - 8191:8191   # Flare-solverr     Cloudflare bypass for Prowlarr (I couldnt get it to work)