diff --git a/gameyfin/.env b/gameyfin/.env
new file mode 100644
index 0000000..3d3dc63
--- /dev/null
+++ b/gameyfin/.env
@@ -0,0 +1,18 @@
+# Generate a new APP_KEY using the command "openssl rand -base64 32" or similar.
+APP_KEY=3WkfZ7Tqxs4jgbxitYStGFsQOpQJ9xMVcuZVG/7ILak=
+
+# (optional) Set the URL of your Gameyfin instance if you are using a reverse proxy.
+# Currently, this is only used for generating links in notification emails and the log line at first run.
+APP_URL=https://gameyfin.happylizard.me
+
+PUID=1000 # Change this to your user ID if needed
+PGID=1000 # Change this to your group ID if needed
+
+# The location of gameyfin config files like metadata and db files
+GAMEYFIN_CONFIG_DIR=
+
+# Should point to where games are located
+GAMEYFIN_MEDIA_DIR=
+
+# The port on where gameyfin will be hosted
+PORT=8095
diff --git a/gameyfin/docker-compose.yml b/gameyfin/docker-compose.yml
index fd65cfa..de95633 100644
--- a/gameyfin/docker-compose.yml
+++ b/gameyfin/docker-compose.yml
@@ -3,26 +3,16 @@ services:
     image: ghcr.io/gameyfin/gameyfin:2
     container_name: gameyfin
     restart: unless-stopped
-    environment:
-      # Generate a new APP_KEY using the command "openssl rand -base64 32" or similar.
-      APP_KEY: qFM/vxkrlP4z9eYLisIZcRC7PpSjG+tIktEcGfuewtU=
-
-      # (optional) Set the URL of your Gameyfin instance if you are using a reverse proxy.
-      # Currently, this is only used for generating links in notification emails and the log line at first run.
-      APP_URL: https://gameyfin.happylizard.me
-
-      # (optional) Set the user and group ID to run Gameyfin with a specific user.
-      PUID: 1000 # Change this to your user ID if needed
-      PGID: 1000 # Change this to your group ID if needed
+    env_file:
+      .env
     volumes:
-      - "./gameyfin/db:/opt/gameyfin/db"
-      - "./gameyfin/data:/opt/gameyfin/data"
-      - "./gameyfin/plugindata:/opt/gameyfin/plugindata"
-      - "./gameyfin/logs:/opt/gameyfin/logs"
-      - "/mnt/nas2/BACKUPS/server_backup/media/games:/opt/gameyfin/games"
-      - "/mnt/nas2/BACKUPS/server_backup/media/rstack/downloads/games:/opt/gameyfin/torrented"
+      - ${GAMEYFIN_DATA_DIR:-gameyfin}/db:/opt/gameyfin/db
+      - ${GAMEYFIN_DATA_DIR:-gameyfin}/data:/opt/gameyfin/data
+      - ${GAMEYFIN_DATA_DIR:-gameyfin}/plugindata:/opt/gameyfin/plugindata
+      - ${GAMEYFIN_DATA_DIR:-gameyfin}/logs:/opt/gameyfin/logs
+      - ${GAMEYFIN_MEDIA_DIR:-games}:/opt/gameyfin/games
     ports:
-      - "8095:8080"
+      - ${PORT}:8080
       # If you plan to use the included torrent plugin, uncomment the following lines:
       # - "6969:6969"
       # - "6881:6881"