diff --git a/home-gallery/docker-compose.yml b/home-gallery/docker-compose.yml
index 2151437..34f9317 100644
--- a/home-gallery/docker-compose.yml
+++ b/home-gallery/docker-compose.yml
@@ -1,8 +1,7 @@
 version: "3.9"
+
 services:
   api:
-    # custom build via
-    #build: packages/api-server
     image: xemle/home-gallery-api-server
     container_name: home-gallery-api-server
     restart: unless-stopped
@@ -51,7 +50,7 @@ services:
       - "traefik.http.middlewares.home-gallery-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.home-gallery.middlewares=home-gallery-https-redirect"
       - "traefik.http.routers.home-gallery-secure.entrypoints=https"
-      - "traefik.http.routers.home-gallery-secure.rule=Host(`home-gallery.local.waylonwalker.com`)"
+      - "traefik.http.routers.home-gallery-secure.rule=Host(`home-gallery.${URL}`)"
       - "traefik.http.routers.home-gallery-secure.tls=true"
       - "traefik.http.routers.home-gallery-secure.service=home-gallery"
       - "traefik.http.services.home-gallery.loadbalancer.server.port=3000"
diff --git a/librespeed/docker-compose.yml b/librespeed/docker-compose.yml
index 53293c4..ffb45be 100644
--- a/librespeed/docker-compose.yml
+++ b/librespeed/docker-compose.yml
@@ -1,4 +1,5 @@
 version: "3.1"
+
 services:
   librespeed:
     image: lscr.io/linuxserver/librespeed
@@ -8,17 +9,6 @@ services:
       - no-new-privileges:true
     networks:
       - proxy
-    # environment:
-    #   - PUID=1000
-    #   - PGID=1000
-    # - PASSWORD=PASSWORD
-    # - CUSTOM_RESULTS=false #optional
-    # - DB_TYPE=sqlite #optional
-    # - DB_NAME=DB_NAME #optional
-    # - DB_HOSTNAME=DB_HOSTNAME #optional
-    # - DB_USERNAME=DB_USERNAME #optional
-    # - DB_PASSWORD=DB_PASSWORD #optional
-    # - DB_PORT=DB_PORT #optional
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${PWD}/data/librespeed/config:/config
@@ -30,7 +20,7 @@ services:
       - "traefik.http.middlewares.librespeed-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.librespeed.middlewares=librespeed-https-redirect"
       - "traefik.http.routers.librespeed-secure.entrypoints=https"
-      - "traefik.http.routers.librespeed-secure.rule=Host(`librespeed.local.waylonwalker.com`)"
+      - "traefik.http.routers.librespeed-secure.rule=Host(`librespeed.${URL}`)"
       - "traefik.http.routers.librespeed-secure.tls=true"
       - "traefik.http.routers.librespeed-secure.service=librespeed"
       - "traefik.http.services.librespeed.loadbalancer.server.port=80"
diff --git a/netdata/docker-compose.yml b/netdata/docker-compose.yml
index 8f9a0fb..0e8fcc1 100644
--- a/netdata/docker-compose.yml
+++ b/netdata/docker-compose.yml
@@ -1,10 +1,10 @@
 version: "3"
+
 services:
   netdata:
     image: netdata/netdata
     container_name: netdata
-    # ports:
-    #   - 19999:19999
+    restart: unless-stopped
     cap_add:
       - SYS_PTRACE
     networks:
@@ -25,7 +25,7 @@ services:
       - "traefik.http.middlewares.netdata-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.netdata.middlewares=netdata-https-redirect"
       - "traefik.http.routers.netdata-secure.entrypoints=https"
-      - "traefik.http.routers.netdata-secure.rule=Host(`netdata.local.waylonwalker.com`)"
+      - "traefik.http.routers.netdata-secure.rule=Host(`netdata.${URL}`)"
       - "traefik.http.routers.netdata-secure.tls=true"
       - "traefik.http.routers.netdata-secure.service=netdata"
       - "traefik.http.services.netdata.loadbalancer.server.port=19999"
diff --git a/photoview/docker-compose.yml b/photoview/docker-compose.yml
index 0fd5a6d..8ef3262 100644
--- a/photoview/docker-compose.yml
+++ b/photoview/docker-compose.yml
@@ -9,14 +9,14 @@ services:
       - no-new-privileges:true
     networks:
       - proxy
-    environment:
-      - MYSQL_DATABASE=photoview
-      - MYSQL_USER=photoview
-      - MYSQL_PASSWORD=photosecret
-      - MYSQL_RANDOM_ROOT_PASSWORD=1
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - db_data:/var/lib/mysql
+    environment:
+      - MYSQL_DATABASE=${PHOTOVIEW_MYSQL_DATABASE}
+      - MYSQL_USER=${PHOTOVIEW_MYSQL_USER}
+      - MYSQL_RANDOM_ROOT_PASSWORD=${PHOTOVIEW_MYSQL_RANDOM_ROOT_PASSWORD}
+      - MYSQL_PASSWORD=${PHOTOVIEW_MYSQL_PASSWORD}
 
   photoview:
     image: viktorstrate/photoview:2
@@ -64,7 +64,7 @@ services:
       - "traefik.http.middlewares.photoview-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.photoview.middlewares=photoview-https-redirect"
       - "traefik.http.routers.photoview-secure.entrypoints=https"
-      - "traefik.http.routers.photoview-secure.rule=Host(`photoview.local.waylonwalker.com`)"
+      - "traefik.http.routers.photoview-secure.rule=Host(`photoview.${URL}`)"
       - "traefik.http.routers.photoview-secure.tls=true"
       - "traefik.http.routers.photoview-secure.service=photoview"
       - "traefik.http.services.photoview.loadbalancer.server.port=80"
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
index ce7445d..15c4e93 100644
--- a/pihole/docker-compose.yml
+++ b/pihole/docker-compose.yml
@@ -1,6 +1,5 @@
 version: "3"
 
-# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole:
     image: pihole/pihole:latest
diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml
index 6d36f18..f4431eb 100644
--- a/portainer/docker-compose.yml
+++ b/portainer/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
       - "traefik.http.routers.portainer-secure.entrypoints=https"
-      - "traefik.http.routers.portainer-secure.rule=Host(`portainer.local.waylonwalker.com`)"
+      - "traefik.http.routers.portainer-secure.rule=Host(`portainer.${URL}`)"
       - "traefik.http.routers.portainer-secure.tls=true"
       - "traefik.http.routers.portainer-secure.service=portainer"
       - "traefik.http.services.portainer.loadbalancer.server.port=9000"
diff --git a/shinobi/docker-compose.yml b/shinobi/docker-compose.yml
index 9d2e901..69628b9 100644
--- a/shinobi/docker-compose.yml
+++ b/shinobi/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - "traefik.http.middlewares.shinobi-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.shinobi.middlewares=shinobi-https-redirect"
       - "traefik.http.routers.shinobi-secure.entrypoints=https"
-      - "traefik.http.routers.shinobi-secure.rule=Host(`shinobi.local.waylonwalker.com`)"
+      - "traefik.http.routers.shinobi-secure.rule=Host(`shinobi.${URL}`)"
       - "traefik.http.routers.shinobi-secure.tls=true"
       - "traefik.http.routers.shinobi-secure.service=shinobi"
       - "traefik.http.services.shinobi.loadbalancer.server.port=8080"
diff --git a/syncthing/docker-compose.yml b/syncthing/docker-compose.yml
index 45c4bc0..3dfeab8 100644
--- a/syncthing/docker-compose.yml
+++ b/syncthing/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - "traefik.http.middlewares.syncthing-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.syncthing.middlewares=syncthing-https-redirect"
       - "traefik.http.routers.syncthing-secure.entrypoints=https"
-      - "traefik.http.routers.syncthing-secure.rule=Host(`syncthing.local.waylonwalker.com`)"
+      - "traefik.http.routers.syncthing-secure.rule=Host(`syncthing.${URL}`)"
       - "traefik.http.routers.syncthing-secure.tls=true"
       - "traefik.http.routers.syncthing-secure.service=syncthing"
       - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
diff --git a/tailscale/docker-compose.yml b/tailscale/docker-compose.yml
new file mode 100644
index 0000000..74725e2
--- /dev/null
+++ b/tailscale/docker-compose.yml
@@ -0,0 +1,30 @@
+version: "3.3"
+
+services:
+  tailscale:
+    image: tailscale/tailscale
+    container_name: tailscaled
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+    networks:
+      - proxy
+    volumes:
+      - "/var/lib:/var/lib"
+      - "/dev/net/tun:/dev/net/tun"
+    # network_mode: host
+    environment:
+      - TS_AUTHKEY=${TS_AUTHKEY}
+
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.tailscale.entrypoints=http"
+      - "traefik.http.routers.tailscale.rule=Host(`tailscale.${URL}`)"
+      - "traefik.http.middlewares.tailscale-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.tailscale.middlewares=tailscale-https-redirect"
+      - "traefik.http.routers.tailscale-secure.entrypoints=https"
+      - "traefik.http.routers.tailscale-secure.rule=Host(`tailscale.${URL}`)"
+      - "traefik.http.routers.tailscale-secure.tls=true"
+      - "traefik.http.routers.tailscale-secure.service=tailscale"
+      - "traefik.http.services.tailscale.loadbalancer.server.port=9000"
+      - "traefik.docker.network=proxy"
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 12d6294..feb7522 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - 80:80
       - 443:443
     environment:
-      - CF_API_EMAIL=waylon@waylonwalker.com
+      - CF_API_EMAIL=${CF_API_EMAIL}
       - CF_DNS_API_TOKEN=${CF_DNS_API_TOKEN}
       # - CF_API_KEY=YOUR_API_KEY
       # be sure to use the correct one depending on if you are using a token or key
diff --git a/wyze-bridge/docker-compose.yml b/wyze-bridge/docker-compose.yml
index 341be8e..a20147c 100644
--- a/wyze-bridge/docker-compose.yml
+++ b/wyze-bridge/docker-compose.yml
@@ -9,14 +9,9 @@ services:
       - no-new-privileges:true
     networks:
       - proxy
-    # ports:
-    # - 1935:6100
-    # - 8554:6102
-    # - 8888:6103
-    # - 5000:6104
     environment:
       - QUALITY=SD30
-      - WYZE_EMAIL=quadmx08@gmail.com
+      - WYZE_EMAIL=${WYZE_EMAIL}
       - WYZE_PASSWORD=${WYZE_PASSWORD}
       - SNAPSHOT=RTSP1
       - IMG_DIR=/img/
@@ -34,7 +29,7 @@ services:
       - "traefik.http.middlewares.cams-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.routers.cams.middlewares=cams-https-redirect"
       - "traefik.http.routers.cams-secure.entrypoints=https"
-      - "traefik.http.routers.cams-secure.rule=Host(`cams.local.waylonwalker.com`)"
+      - "traefik.http.routers.cams-secure.rule=Host(`cams.${URL}`)"
       - "traefik.http.routers.cams-secure.tls=true"
       - "traefik.http.routers.cams-secure.service=cams"
       - "traefik.http.services.cams.loadbalancer.server.port=5000"