diff --git a/docker-compose.yml b/docker-compose.yml
index cd4444d..ce1d5ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ configs:
           file_server
         }
       }
-      mimi.kucharczyk.xyz {
+      mimi.${DOMAIN} {
         handle {
           root * /etc/caddy/sites-enabled
           file_server {
@@ -48,13 +48,13 @@ configs:
           }
         }
       }
-      files.kucharczyk.xyz {
+      files.${DOMAIN_LOCAL} {
           reverse_proxy 192.168.0.106:3923
       }
-      photos.kucharczyk.xyz {
+      photos.${DOMAIN} {
           reverse_proxy 192.168.0.167:2283
       }
-      http://ca.home.arpa {
+      http://ca.${DOMAIN_LOCAL} {
         root * /data/caddy/pki/authorities/local/
         file_server browse
       }
@@ -219,6 +219,9 @@ services:
       - "${DOCKER_STORAGE_PATH}/audiobookshelf/metadata:/metadata"
     ports:
       - "${AUDIOBOOKSHELF_EXTERNAL_PORT}:${AUDIOBOOKSHELF_INTERNAL_PORT}"
+    labels:
+      caddy: audiobooks.${DOMAIN_LOCAL}
+      caddy.reverse_proxy: "{{ upstreams 80 }}"
     networks:
       public:
         ipv4_address: 192.168.240.6
@@ -276,7 +279,7 @@ services:
   webhook:
     image: ${REGISTRY_URL}/webhook
     container_name: webhook
-    build: https://git.kucharczyk.xyz/containers/webhook.git#main
+    build: https://git.${DOMAIN}/containers/webhook.git#main
     user: ${PUID}:${PGID}
     environment:
       - TZ=${TZ}
@@ -400,6 +403,9 @@ services:
       - tika
     ports:
       - "${PAPERLESS_EXTERNAL_PORT}:${PAPERLESS_INTERNAL_PORT}"
+    labels:
+      caddy: paperless.${DOMAIN_LOCAL}
+      caddy.reverse_proxy: "{{ upstreams $PAPERLESS_INTERNAL_PORT }}"
     networks:
       public:
         ipv4_address: 192.168.240.16
@@ -456,7 +462,7 @@ services:
     ports:
       - "${HOMER_EXTERNAL_PORT}:${HOMER_INTERNAL_PORT}"
     labels:
-      caddy: dashboard.home.arpa
+      caddy: dashboard.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $HOMER_INTERNAL_PORT }}"
     networks:
       public:
@@ -516,7 +522,7 @@ services:
     ports:
       - "${PHOTOPRISM_EXTERNAL_PORT}:${PHOTOPRISM_INTERNAL_PORT}"
     labels:
-      caddy: photoprism.home.arpa
+      caddy: photoprism.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams 2342 }}"
     depends_on:
       - mariadb
@@ -681,7 +687,7 @@ services:
       - 6881:6881
       - 6881:6881/udp
     labels:
-      caddy: qbt.home.arpa
+      caddy: qbt.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $QBITTORRENT_WEBUI_INTERNAL_PORT }}"
     restart: unless-stopped
 
@@ -696,10 +702,10 @@ services:
     ports:
       - 8005:8000
     labels:
-      caddy: bwiki.${DOMAIN} bwiki.home.arpa
+      caddy: bwiki.${DOMAIN}, bwiki.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams 8000 }}"
     environment:
-      - bw_canonical_origin=bwiki.kucharczyk.xyz
+      - bw_canonical_origin=bwiki.${DOMAIN}
       - bw_feature_search_suggestions=true
       - bw_port=8000
 
@@ -733,7 +739,7 @@ services:
       BROWSER_WEB_URL: http://chrome:9222
       NEXTAUTH_SECRET: lB5mx3t9mdKclELtt+cs2pVBefB+8vD4dKuzhvUP+JzR9bL1
       MEILI_MASTER_KEY: Cvu7m/RIGYQPiYcIrxacHFhbfLKfKq3wwSAWJPKVWQEauiIX
-      NEXTAUTH_URL: https://karakeep.kucharczykx.xyz
+      NEXTAUTH_URL: https://karakeep.${DOMAIN}
       DISABLE_SIGNUPS: TRUE
       CRAWLER_VIDEO_DOWNLOAD: TRUE
       BROWSER_COOKIE_PATH: /data/yt-cookies.json
@@ -928,6 +934,9 @@ services:
       - "5030:5030"
       # - "5031:5031"
       - "50300:50300"
+    labels:
+      caddy: slskd.${DOMAIN_LOCAL}
+      caddy.reverse_proxy: "{{ upstreams 5030 }}"
     env_file:
       - secrets/slskd_secrets.env
     environment:
diff --git a/services/bazarr.yml b/services/bazarr.yml
index 3cc94e6..407221f 100644
--- a/services/bazarr.yml
+++ b/services/bazarr.yml
@@ -9,7 +9,7 @@ services:
       public:
         ipv4_address: 192.168.240.31
     labels:
-      caddy: bazarr.home.arpa
+      caddy: bazarr..${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $BAZARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}
diff --git a/services/calibre-web-automated.yml b/services/calibre-web-automated.yml
index 000b49d..2f3c086 100644
--- a/services/calibre-web-automated.yml
+++ b/services/calibre-web-automated.yml
@@ -11,7 +11,7 @@ services:
     labels:
       # HTTP is needed for Kobo sync to work
       # otherwise downloading books to device fails
-      caddy: "cwa.${DOMAIN}, http://cwa.${DOMAIN}"
+      caddy: "cwa.${DOMAIN}, http://cwa.${DOMAIN}, http://books.${DOMAIN_LOCAL}, books.${DOMAIN_LOCAL}"
       caddy.reverse_proxy: "{{ upstreams 8083 }}"
     environment:
       - PUID=${PUID}
@@ -34,6 +34,9 @@ services:
       UID: ${PUID}
       GID: ${PGID}
       CWA_DB_PATH: "/auth/app.db"
+    labels:
+      caddy: shelfmark.${DOMAIN_LOCAL}
+      caddy.reverse_proxy: "{{ upstreams 8084 }}"
     ports:
       - 8084:8084
     restart: unless-stopped
diff --git a/services/nextcloud.yml b/services/nextcloud.yml
index a433d96..9e915e3 100644
--- a/services/nextcloud.yml
+++ b/services/nextcloud.yml
@@ -1,7 +1,7 @@
 ---
 services:
   nextcloud:
-    image: registry.kucharczyk.xyz/nextcloud:latest
+    image: ${REGISTRY_URL}/nextcloud:latest
     container_name: nextcloud
     networks:
       public:
diff --git a/services/prowlarr.yml b/services/prowlarr.yml
index 8ef0f55..05c3b6a 100644
--- a/services/prowlarr.yml
+++ b/services/prowlarr.yml
@@ -5,7 +5,7 @@ services:
     image: linuxserver/prowlarr:2.0.5.5160-ls126
     container_name: prowlarr
     labels:
-      caddy: prowlarr.home.arpa
+      caddy: prowlarr.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams 9696 }}"
     networks:
       public:
diff --git a/services/radarr.yml b/services/radarr.yml
index 4e557b4..7398752 100644
--- a/services/radarr.yml
+++ b/services/radarr.yml
@@ -9,7 +9,7 @@ services:
       public:
         ipv4_address: 192.168.240.36
     labels:
-      caddy: radarr.home.arpa
+      caddy: radarr.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $RADARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}
diff --git a/services/sonarr.yml b/services/sonarr.yml
index b12170f..6a589c0 100644
--- a/services/sonarr.yml
+++ b/services/sonarr.yml
@@ -9,7 +9,7 @@ services:
     ports:
       - "${SONARR_TV_STANDARD_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
     labels:
-      caddy: sonarr-tv.home.arpa
+      caddy: sonarr-tv.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}
@@ -31,7 +31,7 @@ services:
     ports:
       - "${SONARR_ANIME_EXTERNAL_PORT}:${SONARR_INTERNAL_PORT}"
     labels:
-      caddy: sonarr-anime.home.arpa
+      caddy: sonarr-anime.${DOMAIN_LOCAL}
       caddy.reverse_proxy: "{{ upstreams $SONARR_INTERNAL_PORT }}"
     environment:
       - PUID=${PUID}