diff --git a/.gitignore b/.gitignore
index 5728a2c..15e3fd4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 appdata/
+*.db
diff --git a/admin/.env b/admin/.env
index 72ed86d..7a0a26a 100755
--- a/admin/.env
+++ b/admin/.env
@@ -1,7 +1,7 @@
 #GLOBAL SETTINGS
 COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
+DOCKER_CONFIGS=.
 DOCKERGID=999
 DOCKERHOSTNAME=ProxyServer
 DOCKERLOGGING_MAXFILE=10
@@ -10,8 +10,6 @@ PGID=1000
 PUID=1000
 UMASK=000
 TZ=America/Chicago
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=8ung1e1!
 
 #WATCHTOWER
 WATCHTOWER_NOTIFICATIONS=email
diff --git a/admin/.gitignore b/admin/.gitignore
deleted file mode 100755
index 86337b8..0000000
--- a/admin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-appdata/
\ No newline at end of file
diff --git a/filebrowser/.env b/filebrowser/.env
index a6752ed..1b5fce9 100644
--- a/filebrowser/.env
+++ b/filebrowser/.env
@@ -1,7 +1,7 @@
 #GLOBAL SETTINGS
 COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
+DOCKER_CONFIGS=.
 DOCKERGID=999
 DOCKERHOSTNAME=ProxyServer
 DOCKERLOGGING_MAXFILE=10
@@ -10,8 +10,6 @@ PGID=1000
 PUID=1000
 UMASK=000
 TZ=America/Chicago
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=8ung1e1!
 BACKUP_DIR=/mnt/truenas-backups
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
diff --git a/filebrowser/compose.yml b/filebrowser/compose.yml
index e09e7ab..1e61724 100644
--- a/filebrowser/compose.yml
+++ b/filebrowser/compose.yml
@@ -8,7 +8,7 @@ services:
       - 8484:80
     restart: always
     volumes:
-      - ./config/filebrowser.db:/database/filebrowser.db
-      - ./config/.filebrowser.json:/.filebrowser.json
-      - ./files:/srv
+      - ${DOCKER_CONFIGS}/config/filebrowser.db:/database/filebrowser.db
+      - ${DOCKER_CONFIGS}/config/.filebrowser.json:/.filebrowser.json
+      - ${DOCKER_CONFIGS}/files:/srv
       - ${STORAGE_DIR}:/truenas-storage
diff --git a/homepage/.env b/homepage/.env
index 427444b..65817aa 100644
--- a/homepage/.env
+++ b/homepage/.env
@@ -1,3 +1,20 @@
+#GLOBAL SETTINGS
+COMPOSE_HTTP_TIMEOUT=120
+COMPOSE_IGNORE_ORPHANS=1
+DOCKER_CONFIGS=.
+DOCKERGID=999
+DOCKERHOSTNAME=ProxyServer
+DOCKERLOGGING_MAXFILE=10
+DOCKERLOGGING_MAXSIZE=200k
+PGID=1000
+PUID=1000
+UMASK=000
+TZ=America/Chicago
+BACKUP_DIR=/mnt/truenas-backups
+MEDIA_DIR=/mnt/truenas-media
+STORAGE_DIR=/mnt/truenas-storage
+
+
 #HOMEPAGE
 # RUN AS
 PUID=1000
diff --git a/homepage/compose.yml b/homepage/compose.yml
index 4862a43..248ec24 100644
--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -13,7 +13,7 @@ services:
     ports:
       - 3005:3000
     volumes:
-      - ./config:/app/config
+      - ${DOCKER_CONFIGS}/config:/app/config
 
 networks:
   reverse-proxy:
diff --git a/.env b/mixed/.env
similarity index 96%
rename from .env
rename to mixed/.env
index c6232ca..a017eea 100755
--- a/.env
+++ b/mixed/.env
@@ -1,7 +1,7 @@
 #GLOBAL SETTINGS
 COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
+DOCKER_CONFIGS=.
 DOCKERGID=999
 DOCKERHOSTNAME=ProxyServer
 DOCKERLOGGING_MAXFILE=10
diff --git a/compose.yml b/mixed/compose.yml
similarity index 100%
rename from compose.yml
rename to mixed/compose.yml
diff --git a/reverseproxy/.env b/reverseproxy/.env
index f1ba960..c8bf377 100644
--- a/reverseproxy/.env
+++ b/reverseproxy/.env
@@ -1,6 +1,7 @@
 #GLOBAL SETTINGS
 COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
+DOCKER_CONFIGS=.
 DOCKERGID=999
 DOCKERHOSTNAME=ProxyServer
 DOCKERLOGGING_MAXFILE=10
diff --git a/reverseproxy/compose.yml b/reverseproxy/compose.yml
index 67c0764..e5358c6 100644
--- a/reverseproxy/compose.yml
+++ b/reverseproxy/compose.yml
@@ -12,7 +12,7 @@ services:
       - 9091:9091
     restart: always
     volumes:
-      - ./authelia/config:/config
+      - ${DOCKER_CONFIGS}/authelia/config:/config
 
   goaccess:
     container_name: goaccess
@@ -34,7 +34,7 @@ services:
       - 7880:7880
     restart: always
     volumes:
-      - ./nginxproxymanager/data/logs:/opt/log
+      - ${DOCKER_CONFIGS}/nginxproxymanager/data/logs:/opt/log
 
   nginxproxymanager:
     container_name: nginxproxymanager
@@ -50,9 +50,9 @@ services:
       - 81:81/tcp
     restart: always
     volumes:
-      - ./nginxproxymanager/data:/data
-      - ./nginxproxymanager/letsencrypt:/etc/letsencrypt
-      - ./nginxproxymanager/snippets:/snippets:ro
+      - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data
+      - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt
+      - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro
       - /etc/localtime:/etc/localtime:ro
 
 networks: