diff --git a/.env b/.env
index 4035222..c6232ca 100755
--- a/.env
+++ b/.env
@@ -16,13 +16,6 @@ BACKUP_DIR=/mnt/truenas-backups
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
 
-#OWNCLOUD
-OWNCLOUD_VERSION=latest
-OWNCLOUD_DOMAIN=192.168.1.4:8092
-OWNCLOUD_TRUSTED_DOMAINS=192.168.1.4,owncloud.akanealw.com
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=pknFeqRqFc3RA5N6!rDL
-
 #PIHOLE
 FTLCONF_LOCAL_IPV4=192.168.1.4
 REV_SERVER=false
@@ -35,240 +28,3 @@ WEBPASSWORD=8PVkCY4FbyKWEACiG22^
 #WIREGUARD
 WG_HOST=akanealw.com
 WG_PASSWORD=wBJz7wuazWWmbfTGhM7v
-
-#HOMEPAGE
-# RUN AS
-PUID=1000
-PGID=1000
-
-
-## SERVERS TAB ##
-# ZABBIX
-HOMEPAGE_VAR_ZABBIX_URL=https://zabbix.akanealw.com
-
-# NUTCASE
-HOMEPAGE_VAR_NUTCASE_URL=https://nutcase.akanealw.com
-
-## SERVERS ##
-# PROXMOX
-HOMEPAGE_VAR_PROXMOX_URL_1=https://proxmox1.akanealw.com
-HOMEPAGE_VAR_PROXMOX_URL_2=https://proxmox2.akanealw.com
-HOMEPAGE_VAR_PROXMOX_URL_3=https://proxmox3.akanealw.com
-HOMEPAGE_VAR_PROXMOX_BACKUP_URL=https://proxmoxbackup.akanealw.com
-HOMEPAGE_VAR_PROXMOX_USER=api@pam!homepage
-HOMEPAGE_VAR_PROXMOX_API_KEY=9b17a715-3889-436f-8bfb-0c7173398452
-HOMEPAGE_VAR_PROXMOX_BACKUP_USER=api-access@pbs!homepage
-HOMEPAGE_VAR_PROXMOX_BACKUP_API_KEY=ceca44ca-3c1c-42df-a381-a9701b47cfd7
-
-# TRUENAS
-HOMEPAGE_VAR_TRUENAS_URL=https://truenas.akanealw.com
-HOMEPAGE_VAR_TRUENAS_API_KEY=1-y77GveXGrClL6ztuertRQYUrz8ZJ5oYCTTtdzq52PURj1BCrpCG8vNQ1USpARBDf
-
-## MONITORING ##
-# NGINXPROXYMANAGER
-HOMEPAGE_VAR_NGINXPROXYMANAGER_URL=https://npm.akanealw.com
-HOMEPAGE_VAR_NGINXPROXYMANAGER_USERNAME=akanealw@gmail.com
-HOMEPAGE_VAR_NGINXPROXYMANAGER_PASSWORD=kDhi*NTHDzynCPPcZjY8
-
-# GLUETUN
-HOMEPAGE_VAR_GLUETUN_URL=http://192.168.1.31:8777
-
-# PIHOLE
-HOMEPAGE_VAR_PIHOLE_URL_1=https://piholeserver1.akanealw.com
-HOMEPAGE_VAR_PIHOLE_URL_2=https://piholeserver2.akanealw.com
-HOMEPAGE_VAR_PIHOLE_URL_3=https://piholeserver3.akanealw.com
-HOMEPAGE_VAR_PIHOLE_API_KEY=58b9598374decb080b66f8e337197cdefc66f4a55f7a73e817da6e90e7a429da
-
-# ADGUARD HONME
-HOMEPAGE_VAR_ADGUARD_URL=https://adguard.akanealw.com
-HOMEPAGE_VAR_ADGUARD_USER=akanealw
-HOMEPAGE_VAR_ADGUARD_PASS=Aehaigoothohshoh1aab
-
-## PORTAINER ##
-# PORTAINER
-HOMEPAGE_VAR_PORTAINER_URL_1=https://pt-dockerserver1.akanealw.com
-HOMEPAGE_VAR_PORTAINER_API_KEY_1=ptr_/GT6HCGn6Ho0tVzdcp7WS338aCifrYLP6aNZX+Xixpg=
-HOMEPAGE_VAR_PORTAINER_URL_2=https://pt-dockerserver2.akanealw.com
-HOMEPAGE_VAR_PORTAINER_API_KEY_2=ptr_dNUynzNttul4c6+MijZnUW+dDYP7S/VEW2+xwEUE72s=
-HOMEPAGE_VAR_PORTAINER_URL_3=https://pt-proxyserver.akanealw.com
-HOMEPAGE_VAR_PORTAINER_API_KEY_3=ptr_WjymUfgt8XtOdxq/kFGsi2ZRfxbrebSaH6djxFXVq58=
-HOMEPAGE_VAR_PORTAINER_URL_4=https://pt-dockerservertest.akanealw.com
-HOMEPAGE_VAR_PORTAINER_API_KEY_4=ptr_7UZg1D/IAU3BzAgsJ2U1WUK3fDoHZYw9uuZuHwBC63U=
-HOMEPAGE_VAR_PORTAINER_URL_5=https://pt-dockerserveralpine.akanealw.com
-HOMEPAGE_VAR_PORTAINER_API_KEY_5=ptr_y70KWqHCWcxorrpVDnlnXYjQmmcsXx5sR+31D556i1g=
-
-## DOZZLE ##
-# DOZZLE
-HOMEPAGE_VAR_DOZZLE_URL_1=https://dz-dockerserver1.akanealw.com
-HOMEPAGE_VAR_DOZZLE_URL_2=https://dz-dockerserver2.akanealw.com
-HOMEPAGE_VAR_DOZZLE_URL_3=https://dz-proxyserver.akanealw.com
-HOMEPAGE_VAR_DOZZLE_URL_4=https://dz-dockerservertest.akanealw.com
-HOMEPAGE_VAR_DOZZLE_URL_5=https://dz-dockerserveralpine.akanealw.com
-
-## DOCKGE ##
-# DOCKGE
-HOMEPAGE_VAR_DOCKGE_URL_1=https://dkge-dockerserver1.akanealw.com
-HOMEPAGE_VAR_DOCKGE_URL_2=https://dkge-dockerserver2.akanealw.com
-HOMEPAGE_VAR_DOCKGE_URL_3=https://dkge-proxyserver.akanealw.com
-HOMEPAGE_VAR_DOCKGE_URL_4=https://dkge-dockerservertest.akanealw.com
-HOMEPAGE_VAR_DOCKGE_URL_5=https://dkge-dockerserveralpine.akanealw.com
-
-
-## MEDIA TAB ##
-
-## SEARCH ##
-# NZBDHYDRA
-HOMEPAGE_VAR_NZBHYDRA_URL=https://nzbhydra.akanealw.com
-
-# JACKETT
-HOMEPAGE_VAR_JACKETT_URL=https://jackett.akanealw.com
-
-# PROWLARR
-HOMEPAGE_VAR_PROWLARR_URL=https://prowlarr.akanealw.com
-HOMEPAGE_VAR_PROWLARR_API_KEY=2f569338e49e4211be0457550eefabb2
-
-# JELLYSEER
-HOMEPAGE_VAR_JELLYSEERR_URL=https://jellyseerr.akanealw.com
-HOMEPAGE_VAR_JELLYSEERR_API_KEY=MTcwMDcwMjU2NjI1MTIwMTVjOWIwLTEwZDYtNDU5Yy1hNmRhLTQwNmRjOGIxY2E5OQ==
-
-## ORGANIZE ##
-# SONARR
-HOMEPAGE_VAR_SONARR_URL=https://sonarr.akanealw.com
-HOMEPAGE_VAR_SONARR_API_KEY=e4a9b4463bfc46b38fbe7420f54d3cd0
-
-# RADARR
-HOMEPAGE_VAR_RADARR_URL=https://radarr.akanealw.com
-HOMEPAGE_VAR_RADARR_API_KEY=5d459ee1602945bead1be6d93810bb8a
-
-# TDARR
-HOMEPAGE_VAR_TDARR_URL=https://tdarr.akanealw.com
-
-# LIDARR
-HOMEPAGE_VAR_LIDARR_URL=https://lidarr.akanealw.com
-HOMEPAGE_VAR_LIDARR_API_KEY=7e2e2c76db3a40249bee49ee14d4a672
-
-# BAZARR
-HOMEPAGE_VAR_BAZARR_URL=https://bazarr.akanealw.com
-HOMEPAGE_VAR_BAZARR_API_KEY=52ffe0d71d284c95f426eaa4ac9bfa68
-
-## DOWNLOAD ##
-# QBITTORRENT
-HOMEPAGE_VAR_QBITTORRENT_URL=https://qbittorrent.akanealw.com
-HOMEPAGE_VAR_QBITTORRENT_USERNAME=akanealw
-HOMEPAGE_VAR_QBITTORRENT_PASSWORD=HMsn5n4LY2H2HkqEaYZG
-
-# SABNZBD
-HOMEPAGE_VAR_SABNZBD_URL=https://sabnzbd.akanealw.com
-HOMEPAGE_VAR_SABNZBD_API_KEY=28cf1162819045f9a12916012a704bb4
-
-# SPEEDTEST
-HOMEPAGE_VAR_SPEEDTEST_URL=https://speedtest.akanealw.com
-
-# JDOWNLOADER
-HOMEPAGE_VAR_JDOWNLOADER_URL=https://jdownloader.akanealw.com
-HOMEPAGE_VAR_JDOWNLOADER_USERNAME=akanealw@gmail.com
-HOMEPAGE_VAR_JDOWNLOADER_PASSWORD=trUKY4X8wzGiCr75ZmC9
-HOMEPAGE_VAR_JDOWNLOADER_CLIENT_NAME=jdownloader@docker
-
-# METUBE
-HOMEPAGE_VAR_METUBE_URL=https://metube.akanealw.com
-
-## CONSUME ##
-# JELLYFIN
-HOMEPAGE_VAR_JELLYFIN_URL=https://jellyfin.akanealw.com
-HOMEPAGE_VAR_JELLYFIN_API_KEY=486f43fad768421087d1fde4a93c1341
-
-# MSTREAM
-HOMEPAGE_VAR_MSTREAM_URL=https://mstream.akanealw.com
-
-# KAVITA
-HOMEPAGE_VAR_KAVITA_URL=https://kavita.akanealw.com
-HOMEPAGE_VAR_KAVITA_USERNAME=akanealw
-HOMEPAGE_VAR_KAVITA_PASSWORD=NneY3arvXx2FacypvEkU
-
-
-## LINKS TAB ##
-
-## DOCKERSERVER1 ##
-# OLIVETIN
-HOMEPAGE_VAR_OLIVETIN_URL=https://olivetin.akanealw.com
-
-# ORGANIZR
-HOMEPAGE_VAR_ORGANIZR_URL=https://organizr.akanealw.com
-
-# PEANUT
-HOMEPAGE_VAR_PEANUT_URL=https://peanut.akanealw.com
-
-# STIRLING PDF
-HOMEPAGE_VAR_STIRLING_PDF_URL=https://spdf.akanealw.com
-
-# SYNCTHING
-HOMEPAGE_VAR_SYNCTHING_URL_1=https://st-dockerserver1.akanealw.com
-HOMEPAGE_VAR_SYNCTHING_URL_2=https://st-gamingpc.akanealw.com
-HOMEPAGE_VAR_SYNCTHING_URL_3=https://st-laptoppc.akanealw.com
-
-## DOCKERSERVER2 ##
-# FRESHRSS
-HOMEPAGE_VAR_FRESHRSS_URL=https://freshrss.akanealw.com
-
-# PAPERLESS-NGX
-HOMEPAGE_VAR_PAPERLESS_NGX_URL=https://paperless.akanealw.com
-
-# PHOTOPRISM
-HOMEPAGE_VAR_PHOTOPRISM_URL=https://photoprism.akanealw.com
-
-# PIPED
-HOMEPAGE_VAR_PIPED_URL=https://piped.akanealw.com
-
-# RSS BRIDGE
-HOMEPAGE_VAR_RSS_BRIDGE_URL=https://rss-bridge.akanealw.com
-
-# SHLINK
-HOMEPAGE_VAR_SHLINK_URL=https://shlink.akanealw.com
-
-# TRILIUM
-HOMEPAGE_VAR_TRILIUM_URL=https://trilium.akanealw.com
-
-## PROXYSERVER ##
-# ARCHIVEBOX
-HOMEPAGE_VAR_ARCHIVEBOX_URL=https://archive.akanealw.com
-
-# BITWARDEN
-HOMEPAGE_VAR_BITWARDEN_URL=https://bitwarden.akanealw.com
-
-# FILE BROWSER
-HOMEPAGE_VAR_FILE_BROWSER_URL=https://filebrowser.akanealw.com
-
-# GIST
-HOMEPAGE_VAR_OPEN_GIST_URL=https://gist.akanealw.com
-
-# GOACCESS
-HOMEPAGE_VAR_GOACCESS_URL=https://goaccess.akanealw.com
-
-# UPTIMEKUMA
-HOMEPAGE_VAR_UPTIME_KUMA_URL=https://uptimekuma.akanealw.com
-
-# WG-EASY
-HOMEPAGE_VAR_WG_EASY_URL=https://wg-easy.akanealw.com
-
-## OTHER SERVERS ##
-# CODESERVER
-HOMEPAGE_VAR_CODESERVER_URL=https://codeserver.akanealw.com
-
-# CRONICLE
-HOMEPAGE_VAR_CRONICLE_URL=https://cronicle.akanealw.com
-
-# GITEA
-HOMEPAGE_VAR_GITEA_URL=https://gitea.akanealw.com
-
-# INVIDIOUS
-HOMEPAGE_VAR_INVIDIOUS_URL=https://invidious.akanealw.com
-
-# NEXTCLOUD
-HOMEPAGE_VAR_NEXTCLOUD_URL=https://nextcloud.akanealw.com
-
-# OPENWRT
-HOMEPAGE_VAR_OPENWRT_URL=https://router.akanealw.com
-
-# PIALERT
-HOMEPAGE_VAR_PIALERT_URL=https://pialert.akanealw.com
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
index f555869..c8a38d8 100755
--- a/compose.yml
+++ b/compose.yml
@@ -30,17 +30,6 @@ services:
     volumes:
       - ${DOCKER_CONFIGS}/archivebox/data:/data
 
-  authelia:
-    container_name: authelia
-    image: authelia/authelia
-    environment:
-      - TZ=${TZ}
-    ports:
-      - 9091:9091
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/authelia/config:/config
-
   filebrowser:
     container_name: filebrowser
     image: filebrowser/filebrowser:latest
@@ -53,55 +42,6 @@ services:
       - ${DOCKER_CONFIGS}/filebrowser/files:/srv
       - ${STORAGE_DIR}:/truenas-storage
 
-  goaccess:
-    container_name: goaccess
-    image: 'xavierh/goaccess-for-nginxproxymanager:latest'
-    environment:
-      - PUID=0
-      - PGID=0
-      - TZ=America/Chicago      
-      - SKIP_ARCHIVED_LOGS=True
-      - DEBUG=False
-      - BASIC_AUTH=False
-      - EXCLUDE_IPS=127.0.0.1,192.168.1.1-192.168.1.255
-      - LOG_TYPE=NPM
-      - HTML_REFRESH=5
-      - KEEP_LAST=30
-    ports:
-      - 7880:7880
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/nginxproxymanager/data/logs:/opt/log
-
-  homepage:
-    container_name: homepage
-    image: ghcr.io/gethomepage/homepage:latest
-    environment:
-      PUID: ${PUID}
-      PGID: ${PGID}
-    env_file: .env
-    ports:
-      - 3005:3000
-    volumes:
-      - ${DOCKER_CONFIGS}/homepage/config:/app/config
-
-  nginxproxymanager:
-    container_name: nginxproxymanager
-    image: jc21/nginx-proxy-manager:2.10.4
-    environment:
-      - X_FRAME_OPTIONS=sameorigin
-      - DB_SQLITE_FILE=/data/database.sqlite
-    ports:
-      - 443:443/tcp
-      - 80:80/tcp
-      - 81:81/tcp
-    restart: always
-    volumes:
-      - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data
-      - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt
-      - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro
-      - /etc/localtime:/etc/localtime:ro
-
   opengist:
     container_name: opengist
     image: ghcr.io/thomiceli/opengist:1
diff --git a/homepage/.env b/homepage/.env
new file mode 100644
index 0000000..427444b
--- /dev/null
+++ b/homepage/.env
@@ -0,0 +1,236 @@
+#HOMEPAGE
+# RUN AS
+PUID=1000
+PGID=1000
+
+
+## SERVERS TAB ##
+# ZABBIX
+HOMEPAGE_VAR_ZABBIX_URL=https://zabbix.akanealw.com
+
+# NUTCASE
+HOMEPAGE_VAR_NUTCASE_URL=https://nutcase.akanealw.com
+
+## SERVERS ##
+# PROXMOX
+HOMEPAGE_VAR_PROXMOX_URL_1=https://proxmox1.akanealw.com
+HOMEPAGE_VAR_PROXMOX_URL_2=https://proxmox2.akanealw.com
+HOMEPAGE_VAR_PROXMOX_URL_3=https://proxmox3.akanealw.com
+HOMEPAGE_VAR_PROXMOX_BACKUP_URL=https://proxmoxbackup.akanealw.com
+HOMEPAGE_VAR_PROXMOX_USER=api@pam!homepage
+HOMEPAGE_VAR_PROXMOX_API_KEY=9b17a715-3889-436f-8bfb-0c7173398452
+HOMEPAGE_VAR_PROXMOX_BACKUP_USER=api-access@pbs!homepage
+HOMEPAGE_VAR_PROXMOX_BACKUP_API_KEY=ceca44ca-3c1c-42df-a381-a9701b47cfd7
+
+# TRUENAS
+HOMEPAGE_VAR_TRUENAS_URL=https://truenas.akanealw.com
+HOMEPAGE_VAR_TRUENAS_API_KEY=1-y77GveXGrClL6ztuertRQYUrz8ZJ5oYCTTtdzq52PURj1BCrpCG8vNQ1USpARBDf
+
+## MONITORING ##
+# NGINXPROXYMANAGER
+HOMEPAGE_VAR_NGINXPROXYMANAGER_URL=https://npm.akanealw.com
+HOMEPAGE_VAR_NGINXPROXYMANAGER_USERNAME=akanealw@gmail.com
+HOMEPAGE_VAR_NGINXPROXYMANAGER_PASSWORD=kDhi*NTHDzynCPPcZjY8
+
+# GLUETUN
+HOMEPAGE_VAR_GLUETUN_URL=http://192.168.1.31:8777
+
+# PIHOLE
+HOMEPAGE_VAR_PIHOLE_URL_1=https://piholeserver1.akanealw.com
+HOMEPAGE_VAR_PIHOLE_URL_2=https://piholeserver2.akanealw.com
+HOMEPAGE_VAR_PIHOLE_URL_3=https://piholeserver3.akanealw.com
+HOMEPAGE_VAR_PIHOLE_API_KEY=58b9598374decb080b66f8e337197cdefc66f4a55f7a73e817da6e90e7a429da
+
+# ADGUARD HONME
+HOMEPAGE_VAR_ADGUARD_URL=https://adguard.akanealw.com
+HOMEPAGE_VAR_ADGUARD_USER=akanealw
+HOMEPAGE_VAR_ADGUARD_PASS=Aehaigoothohshoh1aab
+
+## PORTAINER ##
+# PORTAINER
+HOMEPAGE_VAR_PORTAINER_URL_1=https://pt-dockerserver1.akanealw.com
+HOMEPAGE_VAR_PORTAINER_API_KEY_1=ptr_/GT6HCGn6Ho0tVzdcp7WS338aCifrYLP6aNZX+Xixpg=
+HOMEPAGE_VAR_PORTAINER_URL_2=https://pt-dockerserver2.akanealw.com
+HOMEPAGE_VAR_PORTAINER_API_KEY_2=ptr_dNUynzNttul4c6+MijZnUW+dDYP7S/VEW2+xwEUE72s=
+HOMEPAGE_VAR_PORTAINER_URL_3=https://pt-proxyserver.akanealw.com
+HOMEPAGE_VAR_PORTAINER_API_KEY_3=ptr_WjymUfgt8XtOdxq/kFGsi2ZRfxbrebSaH6djxFXVq58=
+HOMEPAGE_VAR_PORTAINER_URL_4=https://pt-dockerservertest.akanealw.com
+HOMEPAGE_VAR_PORTAINER_API_KEY_4=ptr_7UZg1D/IAU3BzAgsJ2U1WUK3fDoHZYw9uuZuHwBC63U=
+HOMEPAGE_VAR_PORTAINER_URL_5=https://pt-dockerserveralpine.akanealw.com
+HOMEPAGE_VAR_PORTAINER_API_KEY_5=ptr_y70KWqHCWcxorrpVDnlnXYjQmmcsXx5sR+31D556i1g=
+
+## DOZZLE ##
+# DOZZLE
+HOMEPAGE_VAR_DOZZLE_URL_1=https://dz-dockerserver1.akanealw.com
+HOMEPAGE_VAR_DOZZLE_URL_2=https://dz-dockerserver2.akanealw.com
+HOMEPAGE_VAR_DOZZLE_URL_3=https://dz-proxyserver.akanealw.com
+HOMEPAGE_VAR_DOZZLE_URL_4=https://dz-dockerservertest.akanealw.com
+HOMEPAGE_VAR_DOZZLE_URL_5=https://dz-dockerserveralpine.akanealw.com
+
+## DOCKGE ##
+# DOCKGE
+HOMEPAGE_VAR_DOCKGE_URL_1=https://dkge-dockerserver1.akanealw.com
+HOMEPAGE_VAR_DOCKGE_URL_2=https://dkge-dockerserver2.akanealw.com
+HOMEPAGE_VAR_DOCKGE_URL_3=https://dkge-proxyserver.akanealw.com
+HOMEPAGE_VAR_DOCKGE_URL_4=https://dkge-dockerservertest.akanealw.com
+HOMEPAGE_VAR_DOCKGE_URL_5=https://dkge-dockerserveralpine.akanealw.com
+
+
+## MEDIA TAB ##
+
+## SEARCH ##
+# NZBDHYDRA
+HOMEPAGE_VAR_NZBHYDRA_URL=https://nzbhydra.akanealw.com
+
+# JACKETT
+HOMEPAGE_VAR_JACKETT_URL=https://jackett.akanealw.com
+
+# PROWLARR
+HOMEPAGE_VAR_PROWLARR_URL=https://prowlarr.akanealw.com
+HOMEPAGE_VAR_PROWLARR_API_KEY=2f569338e49e4211be0457550eefabb2
+
+# JELLYSEER
+HOMEPAGE_VAR_JELLYSEERR_URL=https://jellyseerr.akanealw.com
+HOMEPAGE_VAR_JELLYSEERR_API_KEY=MTcwMDcwMjU2NjI1MTIwMTVjOWIwLTEwZDYtNDU5Yy1hNmRhLTQwNmRjOGIxY2E5OQ==
+
+## ORGANIZE ##
+# SONARR
+HOMEPAGE_VAR_SONARR_URL=https://sonarr.akanealw.com
+HOMEPAGE_VAR_SONARR_API_KEY=e4a9b4463bfc46b38fbe7420f54d3cd0
+
+# RADARR
+HOMEPAGE_VAR_RADARR_URL=https://radarr.akanealw.com
+HOMEPAGE_VAR_RADARR_API_KEY=5d459ee1602945bead1be6d93810bb8a
+
+# TDARR
+HOMEPAGE_VAR_TDARR_URL=https://tdarr.akanealw.com
+
+# LIDARR
+HOMEPAGE_VAR_LIDARR_URL=https://lidarr.akanealw.com
+HOMEPAGE_VAR_LIDARR_API_KEY=7e2e2c76db3a40249bee49ee14d4a672
+
+# BAZARR
+HOMEPAGE_VAR_BAZARR_URL=https://bazarr.akanealw.com
+HOMEPAGE_VAR_BAZARR_API_KEY=52ffe0d71d284c95f426eaa4ac9bfa68
+
+## DOWNLOAD ##
+# QBITTORRENT
+HOMEPAGE_VAR_QBITTORRENT_URL=https://qbittorrent.akanealw.com
+HOMEPAGE_VAR_QBITTORRENT_USERNAME=akanealw
+HOMEPAGE_VAR_QBITTORRENT_PASSWORD=HMsn5n4LY2H2HkqEaYZG
+
+# SABNZBD
+HOMEPAGE_VAR_SABNZBD_URL=https://sabnzbd.akanealw.com
+HOMEPAGE_VAR_SABNZBD_API_KEY=28cf1162819045f9a12916012a704bb4
+
+# SPEEDTEST
+HOMEPAGE_VAR_SPEEDTEST_URL=https://speedtest.akanealw.com
+
+# JDOWNLOADER
+HOMEPAGE_VAR_JDOWNLOADER_URL=https://jdownloader.akanealw.com
+HOMEPAGE_VAR_JDOWNLOADER_USERNAME=akanealw@gmail.com
+HOMEPAGE_VAR_JDOWNLOADER_PASSWORD=trUKY4X8wzGiCr75ZmC9
+HOMEPAGE_VAR_JDOWNLOADER_CLIENT_NAME=jdownloader@docker
+
+# METUBE
+HOMEPAGE_VAR_METUBE_URL=https://metube.akanealw.com
+
+## CONSUME ##
+# JELLYFIN
+HOMEPAGE_VAR_JELLYFIN_URL=https://jellyfin.akanealw.com
+HOMEPAGE_VAR_JELLYFIN_API_KEY=486f43fad768421087d1fde4a93c1341
+
+# MSTREAM
+HOMEPAGE_VAR_MSTREAM_URL=https://mstream.akanealw.com
+
+# KAVITA
+HOMEPAGE_VAR_KAVITA_URL=https://kavita.akanealw.com
+HOMEPAGE_VAR_KAVITA_USERNAME=akanealw
+HOMEPAGE_VAR_KAVITA_PASSWORD=NneY3arvXx2FacypvEkU
+
+
+## LINKS TAB ##
+
+## DOCKERSERVER1 ##
+# OLIVETIN
+HOMEPAGE_VAR_OLIVETIN_URL=https://olivetin.akanealw.com
+
+# ORGANIZR
+HOMEPAGE_VAR_ORGANIZR_URL=https://organizr.akanealw.com
+
+# PEANUT
+HOMEPAGE_VAR_PEANUT_URL=https://peanut.akanealw.com
+
+# STIRLING PDF
+HOMEPAGE_VAR_STIRLING_PDF_URL=https://spdf.akanealw.com
+
+# SYNCTHING
+HOMEPAGE_VAR_SYNCTHING_URL_1=https://st-dockerserver1.akanealw.com
+HOMEPAGE_VAR_SYNCTHING_URL_2=https://st-gamingpc.akanealw.com
+HOMEPAGE_VAR_SYNCTHING_URL_3=https://st-laptoppc.akanealw.com
+
+## DOCKERSERVER2 ##
+# FRESHRSS
+HOMEPAGE_VAR_FRESHRSS_URL=https://freshrss.akanealw.com
+
+# PAPERLESS-NGX
+HOMEPAGE_VAR_PAPERLESS_NGX_URL=https://paperless.akanealw.com
+
+# PHOTOPRISM
+HOMEPAGE_VAR_PHOTOPRISM_URL=https://photoprism.akanealw.com
+
+# PIPED
+HOMEPAGE_VAR_PIPED_URL=https://piped.akanealw.com
+
+# RSS BRIDGE
+HOMEPAGE_VAR_RSS_BRIDGE_URL=https://rss-bridge.akanealw.com
+
+# SHLINK
+HOMEPAGE_VAR_SHLINK_URL=https://shlink.akanealw.com
+
+# TRILIUM
+HOMEPAGE_VAR_TRILIUM_URL=https://trilium.akanealw.com
+
+## PROXYSERVER ##
+# ARCHIVEBOX
+HOMEPAGE_VAR_ARCHIVEBOX_URL=https://archive.akanealw.com
+
+# BITWARDEN
+HOMEPAGE_VAR_BITWARDEN_URL=https://bitwarden.akanealw.com
+
+# FILE BROWSER
+HOMEPAGE_VAR_FILE_BROWSER_URL=https://filebrowser.akanealw.com
+
+# GIST
+HOMEPAGE_VAR_OPEN_GIST_URL=https://gist.akanealw.com
+
+# GOACCESS
+HOMEPAGE_VAR_GOACCESS_URL=https://goaccess.akanealw.com
+
+# UPTIMEKUMA
+HOMEPAGE_VAR_UPTIME_KUMA_URL=https://uptimekuma.akanealw.com
+
+# WG-EASY
+HOMEPAGE_VAR_WG_EASY_URL=https://wg-easy.akanealw.com
+
+## OTHER SERVERS ##
+# CODESERVER
+HOMEPAGE_VAR_CODESERVER_URL=https://codeserver.akanealw.com
+
+# CRONICLE
+HOMEPAGE_VAR_CRONICLE_URL=https://cronicle.akanealw.com
+
+# GITEA
+HOMEPAGE_VAR_GITEA_URL=https://gitea.akanealw.com
+
+# INVIDIOUS
+HOMEPAGE_VAR_INVIDIOUS_URL=https://invidious.akanealw.com
+
+# NEXTCLOUD
+HOMEPAGE_VAR_NEXTCLOUD_URL=https://nextcloud.akanealw.com
+
+# OPENWRT
+HOMEPAGE_VAR_OPENWRT_URL=https://router.akanealw.com
+
+# PIALERT
+HOMEPAGE_VAR_PIALERT_URL=https://pialert.akanealw.com
\ No newline at end of file
diff --git a/homepage/compose.yml b/homepage/compose.yml
new file mode 100644
index 0000000..303dbfe
--- /dev/null
+++ b/homepage/compose.yml
@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  homepage:
+    container_name: homepage
+    image: ghcr.io/gethomepage/homepage:latest
+    environment:
+      PUID: ${PUID}
+      PGID: ${PGID}
+    env_file: .env
+    networks:
+      - reverse-proxy
+    ports:
+      - 3005:3000
+    volumes:
+      - ./homepage/config:/app/config
+
+networks:
+  reverse-proxy:
+    name: reverse-proxy
+    external: true
diff --git a/homepage/bookmarks.yaml b/homepage/config/bookmarks.yaml
similarity index 100%
rename from homepage/bookmarks.yaml
rename to homepage/config/bookmarks.yaml
diff --git a/homepage/services.yaml b/homepage/config/services.yaml
similarity index 100%
rename from homepage/services.yaml
rename to homepage/config/services.yaml
diff --git a/homepage/settings.yaml b/homepage/config/settings.yaml
similarity index 100%
rename from homepage/settings.yaml
rename to homepage/config/settings.yaml
diff --git a/homepage/widgets.yaml b/homepage/config/widgets.yaml
similarity index 100%
rename from homepage/widgets.yaml
rename to homepage/config/widgets.yaml
diff --git a/reverseproxy/.env b/reverseproxy/.env
new file mode 100644
index 0000000..f1ba960
--- /dev/null
+++ b/reverseproxy/.env
@@ -0,0 +1,11 @@
+#GLOBAL SETTINGS
+COMPOSE_HTTP_TIMEOUT=120
+COMPOSE_IGNORE_ORPHANS=1
+DOCKERGID=999
+DOCKERHOSTNAME=ProxyServer
+DOCKERLOGGING_MAXFILE=10
+DOCKERLOGGING_MAXSIZE=200k
+PGID=1000
+PUID=1000
+UMASK=000
+TZ=America/Chicago
diff --git a/authelia/add-to-protected-domains.conf b/reverseproxy/authelia/add-to-protected-domains.conf
similarity index 100%
rename from authelia/add-to-protected-domains.conf
rename to reverseproxy/authelia/add-to-protected-domains.conf
diff --git a/authelia/auth.domain.conf b/reverseproxy/authelia/auth.domain.conf
similarity index 100%
rename from authelia/auth.domain.conf
rename to reverseproxy/authelia/auth.domain.conf
diff --git a/authelia/configuration.yml b/reverseproxy/authelia/config/configuration.yml
similarity index 100%
rename from authelia/configuration.yml
rename to reverseproxy/authelia/config/configuration.yml
diff --git a/authelia/users_database.yml b/reverseproxy/authelia/config/users_database.yml
similarity index 100%
rename from authelia/users_database.yml
rename to reverseproxy/authelia/config/users_database.yml
diff --git a/reverseproxy/compose.yml b/reverseproxy/compose.yml
new file mode 100644
index 0000000..67c0764
--- /dev/null
+++ b/reverseproxy/compose.yml
@@ -0,0 +1,61 @@
+version: '3'
+
+services:
+  authelia:
+    container_name: authelia
+    image: authelia/authelia
+    environment:
+      - TZ=${TZ}
+    networks:
+      - reverse-proxy
+    ports:
+      - 9091:9091
+    restart: always
+    volumes:
+      - ./authelia/config:/config
+
+  goaccess:
+    container_name: goaccess
+    image: 'xavierh/goaccess-for-nginxproxymanager:latest'
+    environment:
+      - PUID=0
+      - PGID=0
+      - TZ=America/Chicago      
+      - SKIP_ARCHIVED_LOGS=True
+      - DEBUG=False
+      - BASIC_AUTH=False
+      - EXCLUDE_IPS=127.0.0.1,192.168.1.1-192.168.1.255
+      - LOG_TYPE=NPM
+      - HTML_REFRESH=5
+      - KEEP_LAST=30
+    networks:
+      - reverse-proxy
+    ports:
+      - 7880:7880
+    restart: always
+    volumes:
+      - ./nginxproxymanager/data/logs:/opt/log
+
+  nginxproxymanager:
+    container_name: nginxproxymanager
+    image: jc21/nginx-proxy-manager:2.10.4
+    environment:
+      - X_FRAME_OPTIONS=sameorigin
+      - DB_SQLITE_FILE=/data/database.sqlite
+    networks:
+      - reverse-proxy
+    ports:
+      - 443:443/tcp
+      - 80:80/tcp
+      - 81:81/tcp
+    restart: always
+    volumes:
+      - ./nginxproxymanager/data:/data
+      - ./nginxproxymanager/letsencrypt:/etc/letsencrypt
+      - ./nginxproxymanager/snippets:/snippets:ro
+      - /etc/localtime:/etc/localtime:ro
+
+networks:
+  reverse-proxy:
+    name: reverse-proxy
+    external: true
diff --git a/npmsnippets/authelia-authrequest.conf b/reverseproxy/nginxproxymanager/snippets/authelia-authrequest.conf
similarity index 100%
rename from npmsnippets/authelia-authrequest.conf
rename to reverseproxy/nginxproxymanager/snippets/authelia-authrequest.conf
diff --git a/npmsnippets/authelia-location.conf b/reverseproxy/nginxproxymanager/snippets/authelia-location.conf
similarity index 100%
rename from npmsnippets/authelia-location.conf
rename to reverseproxy/nginxproxymanager/snippets/authelia-location.conf
diff --git a/npmsnippets/authelia-proxy.conf b/reverseproxy/nginxproxymanager/snippets/authelia-proxy.conf
similarity index 100%
rename from npmsnippets/authelia-proxy.conf
rename to reverseproxy/nginxproxymanager/snippets/authelia-proxy.conf