diff --git a/!newcontainer/dummy-compose.yml b/!newcontainer/compose.yml
similarity index 59%
rename from !newcontainer/dummy-compose.yml
rename to !newcontainer/compose.yml
index 03b94d0..27a589f 100644
--- a/!newcontainer/dummy-compose.yml
+++ b/!newcontainer/compose.yml
@@ -11,10 +11,12 @@ networks:
     name: reverse-proxy
     external: true
 
-{$PUID}
 
-{$PGID}
 
-{$TZ}
+environment: 
+  - PUID=${PUID}
+  - PGID=${PGID}
+  - TZ=${TZ}
 
-$PWD
+volumes:
+  - $PWD/data:/data
diff --git a/adguardhome-sync/.env b/adguardhome-sync/.env
deleted file mode 100755
index b70245b..0000000
--- a/adguardhome-sync/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/archivebox/.env b/archivebox/.env
deleted file mode 100755
index b70245b..0000000
--- a/archivebox/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/archivebox/compose.yml b/archivebox/compose.yml
index c8de93f..d476e8e 100755
--- a/archivebox/compose.yml
+++ b/archivebox/compose.yml
@@ -32,7 +32,7 @@ services:
       - 8283:8000
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/data:/data
+      - $PWD/data:/data
 
     ### Example: To run the Sonic full-text search backend, first download the config file to sonic.cfg
     #   $ curl -O https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/master/etc/sonic.cfg
@@ -50,8 +50,8 @@ services:
       - 1491
     restart: always
     volumes:
-    - ${DOCKER_CONFIGS}/sonic.cfg:/etc/sonic.cfg:ro
-    - ${DOCKER_CONFIGS}/data/sonic:/var/lib/sonic/store
+    - $PWD/sonic.cfg:/etc/sonic.cfg:ro
+    - $PWD/data/sonic:/var/lib/sonic/store
 
 networks:
   archivebox:
diff --git a/cronicle-edge/.env b/cronicle-edge/.env
deleted file mode 100755
index a9ecade..0000000
--- a/cronicle-edge/.env
+++ /dev/null
@@ -1,12 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
diff --git a/cronicle-edge/compose.yml b/cronicle-edge/compose.yml
index fe9b02a..0369af1 100644
--- a/cronicle-edge/compose.yml
+++ b/cronicle-edge/compose.yml
@@ -10,8 +10,8 @@ services:
       - 3012:3012
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/data:/opt/cronicle/data
-      - ${DOCKER_CONFIGS}/server-root:/opt/cronicle/server-root:ro
+      - $PWD/data:/opt/cronicle/data
+      - $PWD/server-root:/opt/cronicle/server-root:ro
 
 networks:
   reverse-proxy:
diff --git a/dockhand/.env b/dockhand/.env
deleted file mode 100755
index b70245b..0000000
--- a/dockhand/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/dockhand/compose.yml b/dockhand/compose.yml
index 0a87c4d..da634d2 100644
--- a/dockhand/compose.yml
+++ b/dockhand/compose.yml
@@ -7,4 +7,4 @@ services:
       - 3330:3000
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${DOCKER_CONFIGS}/dockhand_data:/app/data
+      - $PWD/dockhand_data:/app/data
diff --git a/docmost/.env b/docmost/.env
deleted file mode 100755
index b70245b..0000000
--- a/docmost/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/docmost/compose.yml b/docmost/compose.yml
index ef268cb..17cddb7 100644
--- a/docmost/compose.yml
+++ b/docmost/compose.yml
@@ -17,7 +17,7 @@ services:
       - 3300:3000
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/docmost:/app/data/storage
+      - $PWD/docmost:/app/data/storage
 
   docmost-db:
     container_name: docmost-db
@@ -30,7 +30,7 @@ services:
       - docmost
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/db_data:/var/lib/postgresql/data
+      - $PWD/db_data:/var/lib/postgresql/data
 
   docmost-redis:
     container_name: docmost-redis
@@ -39,7 +39,7 @@ services:
       - docmost
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/redis_data:/data
+      - $PWD/redis_data:/data
 
 networks:
   docmost:
diff --git a/ebookapps/compose.yml b/ebookapps/compose.yml
index 2ed5033..75b9542 100644
--- a/ebookapps/compose.yml
+++ b/ebookapps/compose.yml
@@ -5,10 +5,10 @@ services:
     container_name: calibre-web-automated
     environment:
       # Only change these if you know what you're doing
-      - PUID={$PUID}
-      - PGID={$PGID}
+      - PUID=${PUID}
+      - PGID=${PGID}
       # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-      - TZ={$TZ}
+      - TZ=${TZ}
       # Hardcover API Key required for Hardcover as a Metadata Provider, get one here: https://docs.hardcover.app/api/getting-started/
       - HARDCOVER_TOKEN=your_hardcover_api_key_here
       # If your library is on a network share (e.g., NFS/SMB), disable WAL to reduce locking issues
@@ -19,14 +19,14 @@ services:
       - CWA_PORT_OVERRIDE=8083
     volumes:
       # CW users migrating should stop their existing CW instance, make a copy of the config folder, and bind that here to carry over all of their user settings ect.
-      - ${DOCKER_CONFIGS}/config:/config
+      - $PWD/config:/config
       # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
       - /mnt/media/downloads/books:/cwa-book-ingest
       # If you don't have an existing library, CWA will automatically create one at the bind provided here
-      - ${DOCKER_CONFIGS}/calibre-library:/calibre-library
+      - $PWD/calibre-library:/calibre-library
       # If you use calibre plugins, you can bind your plugins folder here to have CWA attempt to add them to its workflow (WIP)
       # If you are starting with a fresh install, you also need to copy customize.py.json to the Calibre config volume above, in /path/to/config/folder/.config/calibre/customize.py.json, see the note below for more info
-      - ${DOCKER_CONFIGS}/calibre/plugins/folder:/config/.config/calibre/plugins
+      - $PWD/calibre/plugins/folder:/config/.config/calibre/plugins
     ports:
       # Change the first number to change the port you want to access the Web UI, not the second
       - 8083:8083
@@ -39,14 +39,14 @@ services:
     image: ghcr.io/calibrain/shelfmark:latest
     container_name: shelfmark
     environment:
-      - PUID={$PUID}
-      - PGID={$PGID}
+      - PUID=${PUID}
+      - PGID=${PGID}
     ports:
       - 8084:8084
     restart: unless-stopped
     volumes:
       - /mnt/media/downloads/books:/books # Default destination for book downloads
-      - ${DOCKER_CONFIGS}/config:/config # App configuration
+      - $PWD/config:/config # App configuration
       # Required for torrent / usenet - path must match your download client's volume exactly
       # - /path/to/downloads:/path/to/downloads
       
\ No newline at end of file
diff --git a/filebrowser/.env b/filebrowser/.env
deleted file mode 100755
index b70245b..0000000
--- a/filebrowser/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/filebrowser/compose.yml b/filebrowser/compose.yml
index d3f557c..614b00f 100644
--- a/filebrowser/compose.yml
+++ b/filebrowser/compose.yml
@@ -3,11 +3,11 @@ services:
     image: gtstef/filebrowser:stable
     container_name: filebrowser
     environment:
-      - "FILEBROWSER_CONFIG=data/config.yaml" # using our config file at ${DOCKER_CONFIGS}/data/config.yaml
+      - "FILEBROWSER_CONFIG=data/config.yaml" # using our config file at $PWD/data/config.yaml
     ports:
       - 8900:80
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/data:/home/filebrowser/data
-      - ${DOCKER_CONFIGS}/files:/files
+      - $PWD/data:/home/filebrowser/data
+      - $PWD/files:/files
       - /mnt/storage:/storage
diff --git a/freshrss/compose.yml b/freshrss/compose.yml
index cc0f6d7..f166fb3 100644
--- a/freshrss/compose.yml
+++ b/freshrss/compose.yml
@@ -16,8 +16,8 @@ services:
       - 8088:80
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/freshrss/data:/var/www/FreshRSS/data
-      - ${DOCKER_CONFIGS}/freshrss/extensions:/var/www/FreshRSS/extensions
+      - $PWD/freshrss/data:/var/www/FreshRSS/data
+      - $PWD/freshrss/extensions:/var/www/FreshRSS/extensions
       - /etc/localtime:/etc/localtime:ro
 
   freshrss-db:
@@ -33,7 +33,7 @@ services:
       - freshrss
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/freshrss/db/data:/var/lib/postgresql/data
+      - $PWD/freshrss/db/data:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
 
 networks:
diff --git a/gitea/compose.yml b/gitea/compose.yml
index 57adf03..07448e6 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -3,13 +3,13 @@ services:
     image: gitea/gitea:latest
     container_name: gitea
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
+      - USER_UID=${PUID}
+      - USER_GID=${PGID}
     restart: always
     networks:
       - reverse-proxy
     volumes:
-      - ${DOCKER_CONFIGS}/gitea:/data
+      - $PWD/gitea:/data
       - /etc/localtime:/etc/localtime:ro
     ports:
       - 3100:3000
diff --git a/mstream/compose.yml b/mstream/compose.yml
index f26fbf3..c7b8c6d 100644
--- a/mstream/compose.yml
+++ b/mstream/compose.yml
@@ -12,7 +12,7 @@ services:
       - 3001:3000
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/mstream:/config
+      - $PWD/mstream:/config
       - ${STORAGE_DIR}/Music:/music
 
   reverse-proxy:
diff --git a/newt/.env b/newt/.env
deleted file mode 100755
index b70245b..0000000
--- a/newt/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/nextcloud/compose.yml b/nextcloud/compose.yml
index df2ffe8..845715c 100644
--- a/nextcloud/compose.yml
+++ b/nextcloud/compose.yml
@@ -12,8 +12,8 @@ services:
       - 8443:443
     restart: unless-stopped
     volumes:
-      - ${DOCKER_CONFIGS}/config:/config
-      - ${DOCKER_CONFIGS}/data:/data
+      - $PWD/config:/config
+      - $PWD/data:/data
 
 networks:
   reverse-proxy:
diff --git a/olivetin/.env b/olivetin/.env
deleted file mode 100755
index b70245b..0000000
--- a/olivetin/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/olivetin/compose.yml b/olivetin/compose.yml
index 21d17ce..9d27756 100755
--- a/olivetin/compose.yml
+++ b/olivetin/compose.yml
@@ -9,7 +9,7 @@ services:
       - 1337:1337
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/config:/config
+      - $PWD/config:/config
       - /var/run/docker.sock:/var/run/docker.sock
       - /home/akanealw/scripts/olivetin:/scripts:ro
 
diff --git a/opengist/.env b/opengist/.env
deleted file mode 100755
index b70245b..0000000
--- a/opengist/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/opengist/compose.yml b/opengist/compose.yml
index adc8dde..c688eed 100644
--- a/opengist/compose.yml
+++ b/opengist/compose.yml
@@ -8,8 +8,8 @@ services:
     ports:
       - 6157:6157
     volumes:
-      - ${DOCKER_CONFIGS}/data:/opengist
-      - ${DOCKER_CONFIGS}/config.yml:/config.yml
+      - $PWD/data:/opengist
+      - $PWD/config.yml:/config.yml
   
 networks:
   reverse-proxy:
diff --git a/paperlessngx/.env b/paperlessngx/.env
deleted file mode 100755
index a7a7bdc..0000000
--- a/paperlessngx/.env
+++ /dev/null
@@ -1,34 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-SERVERIP=192.168.1.30
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
-
-#PAPERLESS
-PAPERLESS_URL=https://paperless.akanealw.com
-PAPERLESS_SECRET_KEY=fo5soje2caiQu9eed4kuwakeevae5x
-PAPERLESS_TIME_ZONE=America/Chicago
-PAPERLESS_OCR_LANGUAGE=eng
-PAPERLESS_DBPASS=ieta6iuGhoorooluGieceekahFeic4
-PAPERLESS_ADMIN_USER=akanealw
-PAPERLESS_ADMIN_PASSWORD=booshooSekae0eid9Vatohgei1phoo
-PAPERLESS_ADMIN_MAIL=akanealw@gmail.com
-PAPERLESS_OCR_USER_ARGS={"tesseract_timeout": 250, "continue_on_soft_render_error": true}
-PAPERLESS_OCR_MODE=redo
-PAPERLESS_OCR_CLEAN=clean
-PAPERLESS_TASK_WORKERS=2
-PAPERLESS_CONSUMER_RECURSIVE=true
-PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=true
-PAPERLESS_CONSUMER_POLLING=180
-PAPERLESS_FILENAME_FORMAT={created_year}/{correspondent}/{title}
diff --git a/paperlessngx/compose.yml b/paperlessngx/compose.yml
index fb7eacd..4bc9526 100755
--- a/paperlessngx/compose.yml
+++ b/paperlessngx/compose.yml
@@ -6,7 +6,7 @@ services:
       - paperless
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/redis/data:/data
+      - $PWD/redis/data:/data
 
   paperless-postgres:
     container_name: paperless-postgres
@@ -15,7 +15,7 @@ services:
       - paperless
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/postgres/data:/var/lib/postgresql/data
+      - $PWD/postgres/data:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
@@ -41,8 +41,8 @@ services:
       timeout: 10s
       retries: 5
     volumes:
-      - ${DOCKER_CONFIGS}/data:/usr/src/paperless/data
-      - ${DOCKER_CONFIGS}/data:/usr/src/paperless/media
+      - $PWD/data:/usr/src/paperless/data
+      - $PWD/data:/usr/src/paperless/media
       - /mnt/storage/Documents/Paperless/Export:/usr/src/paperless/export
       - /mnt/storage/Documents/Paperless/Input:/usr/src/paperless/consume
     env_file: .env
diff --git a/peanut/.env b/peanut/.env
deleted file mode 100755
index b70245b..0000000
--- a/peanut/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/photoprism/compose.yml b/photoprism/compose.yml
index 189c917..ba5c701 100755
--- a/photoprism/compose.yml
+++ b/photoprism/compose.yml
@@ -49,7 +49,7 @@ services:
     working_dir: "/photoprism" # do not change or remove
     volumes:
       - "${STORAGE_DIR}/Pictures:/photoprism/originals"               # Original media files (DO NOT REMOVE)
-      - "${DOCKER_CONFIGS}/storage:/photoprism/storage"                        # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
+      - "$PWD/storage:/photoprism/storage"                        # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
 
   photoprism-mariadb:
     container_name: photoprism-mariadb
@@ -61,7 +61,7 @@ services:
       - apparmor:unconfined
     command: --innodb-buffer-pool-size=512M --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
     volumes:
-      - "${DOCKER_CONFIGS}/database:/var/lib/mysql"
+      - "$PWD/database:/var/lib/mysql"
     environment:
       MARIADB_AUTO_UPGRADE: "1"
       MARIADB_INITDB_SKIP_TZINFO: "1"
diff --git a/rss-bridge/.env b/rss-bridge/.env
deleted file mode 100755
index a9ecade..0000000
--- a/rss-bridge/.env
+++ /dev/null
@@ -1,12 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
diff --git a/rss-bridge/compose.yml b/rss-bridge/compose.yml
index 16a8d3c..9054236 100755
--- a/rss-bridge/compose.yml
+++ b/rss-bridge/compose.yml
@@ -8,7 +8,7 @@ services:
       - 3006:80
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/config:/config
+      - $PWD/config:/config
 
 networks:
   reverse-proxy:
diff --git a/s-pdf/.env b/s-pdf/.env
deleted file mode 100755
index b70245b..0000000
--- a/s-pdf/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/shlink/compose.yml b/shlink/compose.yml
index 3654372..c56a1ac 100755
--- a/shlink/compose.yml
+++ b/shlink/compose.yml
@@ -34,7 +34,7 @@ services:
       - shlink
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/mariadb/db_data:/var/lib/mysql
+      - $PWD/mariadb/db_data:/var/lib/mysql
 
   shlink-web-client:
     container_name: shlink-web-client
@@ -46,7 +46,7 @@ services:
       - reverse-proxy
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/servers.json:/usr/share/nginx/html/servers.json
+      - $PWD/servers.json:/usr/share/nginx/html/servers.json
 
 networks:
   shlink:
diff --git a/syncthing/compose.yml b/syncthing/compose.yml
index 64b248a..2f8d9ec 100644
--- a/syncthing/compose.yml
+++ b/syncthing/compose.yml
@@ -15,7 +15,7 @@ services:
       - 21027:21027/udp
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/syncthing/config:/config
+      - $PWD/syncthing/config:/config
       - ${STORAGE_DIR}:/storage
 
   syncthing-relay-discovery:
@@ -32,7 +32,7 @@ services:
       - 22026:22026
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/syncthing-relay-discovery:/home/syncthing/certs
+      - $PWD/syncthing-relay-discovery:/home/syncthing/certs
       
   reverse-proxy:
     name: reverse-proxy
diff --git a/termix/compose.yml b/termix/compose.yml
new file mode 100644
index 0000000..7ceeab4
--- /dev/null
+++ b/termix/compose.yml
@@ -0,0 +1,33 @@
+services:
+  termix:
+    image: ghcr.io/lukegus/termix:latest
+    container_name: termix
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+    volumes:
+      - $PWD/termix/data:/app/data
+    environment:
+      PORT: "8080"
+    depends_on:
+      - guacd
+    networks:
+      - termix
+      - reverse-proxy
+
+  guacd:
+    image: guacamole/guacd:1.6.0
+    container_name: guacd
+    restart: unless-stopped
+    ports:
+      - "4822:4822"
+    networks:
+      - termix
+      - reverse-proxy
+
+networks:
+  termix:
+    name: termix
+  reverse-proxy:
+    name: reverse-proxy
+    external: true
diff --git a/vaultwarden/compose.yml b/vaultwarden/compose.yml
index c1e9cb0..0d06bec 100755
--- a/vaultwarden/compose.yml
+++ b/vaultwarden/compose.yml
@@ -21,7 +21,7 @@ services:
       - 8089:80
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/data:/data
+      - $PWD/data:/data
       - /etc/localtime:/etc/localtime:ro
 
   vaultwarden-backup:
@@ -40,7 +40,7 @@ services:
     init: true
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/data:/data
+      - $PWD/data:/data
       - /home/akanealw/backups/vaultwardenbackups:/data/backups
 
 networks:
diff --git a/vpn/compose.yml b/vpn/compose.yml
index dce85b2..23d41a4 100755
--- a/vpn/compose.yml
+++ b/vpn/compose.yml
@@ -30,7 +30,7 @@ services:
     shm_size: "2gb"
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/firefox/config:/config
+      - $PWD/firefox/config:/config
 
   gluetun:
     container_name: gluetun    
@@ -66,7 +66,7 @@ services:
       - 8181:8080 # sabnzbd
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/gluetun:/gluetun
+      - $PWD/gluetun:/gluetun
 
   go-socks5-proxy:
     container_name: socks5
@@ -100,7 +100,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/jdownloader:/config
+      - $PWD/jdownloader:/config
       - ${MEDIA_DIR}/downloads/jdownloader:/output
       - /etc/localtime:/etc/localtime:ro
 
@@ -118,7 +118,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/qbittorrent/config:/config
+      - $PWD/qbittorrent/config:/config
       - ${MEDIA_DIR}:/media
       - ${MEDIA_DIR}/downloads/torrents:/torrents
 
@@ -135,7 +135,7 @@ services:
     network_mode: "service:gluetun"
     restart: always
     volumes:
-      - ${DOCKER_CONFIGS}/sabnzbd:/config
+      - $PWD/sabnzbd:/config
       - ${MEDIA_DIR}:/media
       - ${MEDIA_DIR}/downloads/nzbs:/nzbs    
 
diff --git a/wallos/.env b/wallos/.env
deleted file mode 100755
index b70245b..0000000
--- a/wallos/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=.
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-BACKUP_DIR=/mnt/backups
-MEDIA_DIR=/mnt/media
-STORAGE_DIR=/mnt/storage
diff --git a/wallos/compose.yml b/wallos/compose.yml
index 566fb96..4b00ca8 100644
--- a/wallos/compose.yml
+++ b/wallos/compose.yml
@@ -10,8 +10,8 @@ services:
       TZ: 'America/Chicago'
     restart: unless-stopped
     volumes:
-      - '${DOCKER_CONFIGS}/db:/var/www/html/db'
-      - '${DOCKER_CONFIGS}/logos:/var/www/html/images/uploads/logos'
+      - '$PWD/db:/var/www/html/db'
+      - '$PWD/logos:/var/www/html/images/uploads/logos'
 
 networks:
   reverse-proxy: