diff --git a/_bin/rtpctl.d b/_bin/rtpctl.d
deleted file mode 100755
index cec20cc..0000000
--- a/_bin/rtpctl.d
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /usr/bin/env bash
-
-RPH_UID=${RPH_UID:-${UID}}
-
-rph-docker-exec () {
-    docker exec $1 runtipi-host "${@:2}"
-}
-
-rph-shell() {
-    if rph-docker-exec "" true; then
-         rph-docker-exec "-it --user ${RPH_UID}" bash
-    fi
-}
-
-rph-exec () {
-    local set_x=" set -x; pwd; id; "
-    [ -z "$QUIET" ] || set_x=""
-    local cli="cd ${START_DIR:-/srv/runtipi};${set_x} ${1:?Must supply command} "
-    if [ -n "$ROOT_EXEC" ]; then
-        cli="$cli ${*:2}"
-    else
-        cli="$cli "${2:+"$(
-            printf '\"%s\" ' "${@:2}"
-        )"}
-    fi
-
-    if rph exec runtipi true; then
-        if [ -n "$ROOT_EXEC" ]; then
-           rph exec runtipi /bin/bash <<<"$cli"
-        else
-           rph shell --uid "${RPH_UID}" runtipi /bin/bash -c "$cli"
-        fi
-    else
-        echo "ERROR: ${_ERROR_MGS:-"Please check if runtipi jail has started! Have you tried 'full-start'?"}" >&2
-        exit -1
-    fi
-}
-
-runtipi-cli() {
-    rph-exec ./runtipi-cli "${@}"    
-}
-
-runtipi-app-docker-compose() {
-    local APP="${1:-Must supply app name}"
-    local LOCAL_YML="user-config/${APP}/docker-compose.yml"
-
-    rph exec runtipi test -e "/srv/runtipi/${LOCAL_YML}" || LOCAL_YML=""
-    [ -z "$LOCAL_YML" ] || LOCAL_YML="--file ${LOCAL_YML}"
-
-    rph-exec docker compose \
-        --env-file user-config/.env.local \
-        --env-file app-data/${APP}/app.env \
-        --env-file user-config/${APP}/app.env \
-        --project-name ${APP} \
-        --file apps/${APP}/docker-compose.yml \
-        --file repos/29ca930bfdaffa1dfabf5726336380ede7066bc53297e3c0c868b27c97282903/apps/docker-compose.common.yml \
-        ${LOCAL_YML} ${@:2}
-}
-
-dls() {
-    # Default docker ps format is:
-    # rph-exec docker ps --format "table {{ .ID }}\t{{ .Image }}\t{{ .Command }}\t{{ .Created }}\t{{ .Status }}\t{{ .Ports }}\t{{ .Names }}"
-
-    local base='{{.Status}}\t{{.ID}}\t{{.Names}}\t{{.Image}}' #'\t{{.Networks}}\t{{.Ports}}\t{{.Mounts}}'
-    local compose='{{.Label "com.docker.compose.project"}}\t{{.Label "com.docker.compose.service"}}'
-    local format="table $compose\t$base"
-    ROOT_EXEC=1 QUIET=${QUIET:-0} rph-exec \
-        docker "container ls --all --format '$format' | ( sed -u '1s/.*/\U&/; q'; sed -Ee 's|^|555|; s|^555runtipi|000runtipi|;' | sort | sed -Ee 's/^[[:digit:]]{3}//' )"
-}
-
-case "${1}" in
-    cli)
-        runtipi-cli "${@:2}"
-        ;;
-    log)
-        rph-exec "POSTGRES_PASSWORD=_ TIPI_VERSION=_ LOCAL_DOMAIN=_ DOMAIN=_" docker compose --env-file user-config/.env.local logs --tail=${TAIL:-40} "${2:-runtipi}" ${3:+"${@:3}"}
-        ;;
-    start)
-        runtipi-cli start --env-file user-config/.env.local --no-permissions
-        ;;
-    update)
-        runtipi-cli update --env-file user-config/.env.local --no-permissions "${2:?Must supply version}" "${@:3}"
-        ;;
-    full-start)
-        if ! rph exec runtipi true; then
-            rph start runtipi 
-            sleep 1s
-        fi
-        _ERROR_MSG="ERROR: failed to invoke a command inside the runtipi jail and can't start the jail." \
-        runtipi-cli start --env-file user-config/.env.local --no-permissions
-        ;;
-    shell)
-        rph-shell
-        ;;
-    exec)
-        rph-exec "${@:2}"
-        ;;
-    docker)
-        rph-exec docker "${@:2}"
-        ;;
-    dls)
-        dls "${@:2}"
-        ;;
-    dcoapp)
-        runtipi-app-docker-compose "${@:2}"
-        ;;
-    dockge)
-        START_DIR=/srv/dockge/stacks/${2:?Must supply stack name} rph-exec docker compose "${@:3}"
-        ;;
-    setup)
-        ln -s $2 "$(cd "$(dirname "$0")" && pwd)/$(basename "$0")" "$HOME/.local/bin/"
-        ;;
-    *)
-        printf '%s    %-12s %s\n' \
-            "" "" ""\
-            "Usage:" "" ""\
-            "  $(basename "$0") <command> [args...]" "" ""\
-            "" "" "" \
-            "Available commands:" "" ""\
-            "" "" "" \
-            "runtipi" "" ""\
-            "" "cli"        "runtipi-cli" \
-            "" "full-start" "start runtipi jail, following with starting runtipi" \
-            "" "log"        "runtipi docker stack logs" \
-            "" "start"      "start runtipi" \
-            "" "update"     "update runtipi to a specific version" \
-            "" "" "" \
-            "docker/docker-compose" "" ""\
-            "" "dcoapp"     "docker compose for runtipi apps" \
-            "" "dls"        "stylized docker ls" \
-            "" "docker"     "docker" \
-            "" "dockge"     "docker compose for dockge stacks" \
-            "" "" "" \
-            "misc." "" ""\
-            "" "exec"       "execute within the shell, START_DIR env applies" \
-            "" "shell"      "enter an insteractive shell" \
-            "" "" "" \
-            "" "setup"      "setup runtipictl in user's .local/bin dir" \
-            "" "" "" \
-            "Related env. vars:" "" "" \
-            "" "VISUAL EDITOR RPH_UID QUIET START_DIR ROOT_EXEC" ""
-
-        ;;
-esac
-
diff --git a/_bin/rtpctl.j b/_bin/runtipictl
similarity index 86%
rename from _bin/rtpctl.j
rename to _bin/runtipictl
index 0afccb4..f760ca2 100755
--- a/_bin/rtpctl.j
+++ b/_bin/runtipictl
@@ -4,14 +4,11 @@ jlmkr () {
     sudo VISUAL="${VISUAL:-}" EDITOR="${EDITOR:-}" $SCALE_POOL_ROOT/jailmaker/jlmkr.py "${@:---help}"
 }
 
-RPH_UID=${RPH_UID:-${UID}}
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-BASE_NAME="$(basename "$0")"
-BASE_BASE_NAME="${BASE_NAME%.*}"
+JAIL_UID=${JAIL_UID:-${UID}}
 
 jlmkr-shell() {
     if jlmkr exec runtipi true; then
-         jlmkr shell --uid "${RPH_UID}" runtipi
+         jlmkr shell --uid "${JAIL_UID}" runtipi
     fi
 }
 
@@ -31,7 +28,7 @@ jlmkr-exec () {
         if [ -n "$ROOT_EXEC" ]; then
            jlmkr exec runtipi /bin/bash <<<"$cli"
         else
-           jlmkr shell --uid "${RPH_UID}" runtipi /bin/bash -c "$cli"
+           jlmkr shell --uid "${JAIL_UID}" runtipi /bin/bash -c "$cli"
         fi
     else
         echo "ERROR: ${_ERROR_MGS:-"Please check if runtipi jail has started! Have you tried 'full-start'?"}" >&2
@@ -111,16 +108,13 @@ case "${1}" in
         START_DIR=/srv/dockge/stacks/${2:?Must supply stack name} jlmkr-exec docker compose "${@:3}"
         ;;
     setup)
-        ln -s $2 "$(cd "${SCRIPT_DIR}" && pwd)/${BASE_NAME}" "${3:-$HOME/.local/bin/}"
-        ;;
-    edit)
-        ${VISUAL:-${EDITOR:-vi}} $0
+        ln -s $2 "$(cd "$(dirname "$0")" && pwd)/$(basename "$0")" "$HOME/.local/bin/"
         ;;
     *)
         printf '%s    %-12s %s\n' \
             "" "" ""\
             "Usage:" "" ""\
-            "  ${BASE_NAME} <command> [args...]" "" ""\
+            "  $(basename "$0") <command> [args...]" "" ""\
             "" "" "" \
             "Available commands:" "" ""\
             "" "" "" \
@@ -142,12 +136,9 @@ case "${1}" in
             "" "shell"      "enter an insteractive shell" \
             "" "" "" \
             "" "setup"      "setup runtipictl in user's .local/bin dir" \
-            "" "" "${BASE_NAME} setup" \
-            "" "" "${BASE_NAME} setup '' ~/.local/bin/${BASE_BASE_NAME}" \
-            "" "" "${BASE_NAME} setup '' ~/.local/bin/runtipictl" \
             "" "" "" \
             "Related env. vars:" "" "" \
-            "" "VISUAL EDITOR RPH_UID QUIET START_DIR ROOT_EXEC" ""
+            "" "VISUAL EDITOR JAIL_UID QUIET START_DIR ROOT_EXEC" ""
 
         ;;
 esac
diff --git a/_template/docker-compose.yml b/_template/docker-compose.yml
index cee7988..f23c037 100644
--- a/_template/docker-compose.yml
+++ b/_template/docker-compose.yml
@@ -23,12 +23,10 @@ services:
     # - "container:vols-plex"
     labels:
     # Websecure
-    #   traefik.http.routers.<service-name>.middlewares: authentik_sysmgr@file
-      traefik.http.routers.<service-name>.middlewares: lan-only@file
+      traefik.http.routers.<service-name>.middlewares: authentik_sysmgr@file
     #   traefik.http.routers.<service-name>-more.rule: Host(`<service-name>.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
     #   traefik.http.routers.<service-name>-more.entrypoints: websecure
     #   traefik.http.routers.<service-name>-more.service: <service-name>
     #   traefik.http.routers.<service-name>-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.<service-name>-more.middlewares: lan-only@file
     #   traefik.http.routers.<service-name>-more.tls: true
     #   traefik.http.routers.<service-name>-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/_traefik/static.yml b/_traefik/static.yml
index 283ebb9..f7ead6f 100644
--- a/_traefik/static.yml
+++ b/_traefik/static.yml
@@ -15,18 +15,6 @@
       watch: true
 
   entryPoints:
-    plex:
-      address: ':32400'
-      forwardedHeaders:
-        trustedIPs:
-          - "127.0.0.1/32"
-          - "172.16.0.0/12"
-      http:
-        redirections:
-          entryPoint:
-            to: 'websecure'
-            scheme: 'https'
-
     web:
       address: ':80'
       forwardedHeaders:
diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml
index 6f29918..20ca084 100644
--- a/authentik/docker-compose.yml
+++ b/authentik/docker-compose.yml
@@ -4,5 +4,3 @@ services:
     - type: bind
       source: ${ROOT_FOLDER_HOST}/user-config/${APP_ID}/media
       target: /media
-    labels:
-      traefik.http.routers.authentik.rule: Host(`auth.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
diff --git a/dockge/docker-compose.yml b/dockge/docker-compose.yml
index f47787c..bf603df 100644
--- a/dockge/docker-compose.yml
+++ b/dockge/docker-compose.yml
@@ -16,17 +16,13 @@ services:
       RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
       RUNTIPI_DOMAIN: "${DOMAIN}"
       RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-      SZ_USER_UID: "${SZ_USER_UID}"
-      SZ_USER_GID: "${SZ_USER_GID}"
       PUID: "${SZ_USER_UID}"
       PGID: "${SZ_USER_GID}"
-      TZ: "${TZ:?Did you forget to define TZ in the root RunTipi .env.local?}"
     labels:
-      traefik.http.routers.dockge.rule: Host(`dockge.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
+      traefik.enable: true
+      # traefik.http.services.dockge.loadbalancer.server.port: 5001
+      traefik.http.routers.dockge.entrypoints: websecure
+      traefik.http.routers.dockge.rule: Host(`dockge.${ROOT_DOMAIN}`)
+      traefik.http.routers.dockge.service: dockge
       traefik.http.routers.dockge.middlewares: authentik_sysmgr@file
-
-      # traefik.enable: true
-      # # traefik.http.services.dockge.loadbalancer.server.port: 5001
-      # traefik.http.routers.dockge.entrypoints: websecure
-      # traefik.http.routers.dockge.service: dockge
-      # traefik.http.routers.dockge.tls.certresolver: myresolver
+      traefik.http.routers.dockge.tls.certresolver: myresolver
diff --git a/dozzle/docker-compose.yml b/dozzle/docker-compose.yml
deleted file mode 100644
index 00b20f9..0000000
--- a/dozzle/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-services:
-  dozzle:
-    hostname: dozzle.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    # volumes_from:
-    # - "container:vols-dl"
-    # - "container:vols-personal-media"
-    # - "container:vols-shared-media"
-    # - "container:vols-media"
-    # - "container:vols-arr"
-    # - "container:vols-plex"
-    labels:
-    # Websecure
-      traefik.http.routers.dozzle.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.dozzle.middlewares: lan-only@file
-    #   traefik.http.routers.dozzle-more.rule: Host(`dozzle.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-    #   traefik.http.routers.dozzle-more.entrypoints: websecure
-    #   traefik.http.routers.dozzle-more.service: dozzle
-    #   traefik.http.routers.dozzle-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.dozzle-more.middlewares: lan-only@file
-    #   traefik.http.routers.dozzle-more.tls: true
-    #   traefik.http.routers.dozzle-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/homepage/docker-compose.yml b/homepage/docker-compose.yml
deleted file mode 100644
index d5f972f..0000000
--- a/homepage/docker-compose.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-services:
-  homepage:
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-
-    labels:
-    # Websecure
-      traefik.http.routers.homepage.middlewares: authentik_sysmgr@file
-      traefik.http.routers.homepage.rule: Host(`www.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-      # #traefik.http.routers.homepage-more.rule: Host(`www.${LEGACY_ROOT_DOMAIN}`)
-      # traefik.http.routers.homepage-more.entrypoints: websecure
-      # traefik.http.routers.homepage-more.service: homepage
-      # traefik.http.routers.homepage-more.middlewares: authentik_sysmgr@file
-      # traefik.http.routers.homepage-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/overseerr/docker-compose.yml b/overseerr/docker-compose.yml
deleted file mode 100644
index 3e41133..0000000
--- a/overseerr/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-services:
-  overseerr:
-    hostname: overseerr.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    labels:
-    # Websecure
-      traefik.http.routers.overseerr.rule: Host(`req.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
\ No newline at end of file
diff --git a/prowlarr/docker-compose.yml b/prowlarr/docker-compose.yml
deleted file mode 100644
index 33751b9..0000000
--- a/prowlarr/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-services:
-  prowlarr:
-    hostname: prowlarr.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    labels:
-    # Websecure
-      traefik.http.routers.prowlarr.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.prowlarr.middlewares: lan-only@file
-      traefik.http.routers.prowlarr.rule: Host(`prowlarr.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-    #   traefik.http.routers.prowlarr-more.entrypoints: websecure
-    #   traefik.http.routers.prowlarr-more.service: prowlarr
-    #   traefik.http.routers.prowlarr-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.prowlarr-more.middlewares: lan-only@file
-    #   traefik.http.routers.prowlarr-more.tls: true
-    #   traefik.http.routers.prowlarr-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/radarr/docker-compose.yml b/radarr/docker-compose.yml
deleted file mode 100644
index 5d30fae..0000000
--- a/radarr/docker-compose.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-services:
-  radarr:
-    hostname: radarr.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    volumes_from:
-    - "container:vols-arr"
-    labels:
-    # Websecure
-      traefik.http.routers.radarr.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.radarr.middlewares: lan-only@file
-    #   traefik.http.routers.radarr-more.rule: Host(`radarr.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-    #   traefik.http.routers.radarr-more.entrypoints: websecure
-    #   traefik.http.routers.radarr-more.service: radarr
-    #   traefik.http.routers.radarr-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.radarr-more.middlewares: lan-only@file
-    #   traefik.http.routers.radarr-more.tls: true
-    #   traefik.http.routers.radarr-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/sabnzbd/docker-compose.yml b/sabnzbd/docker-compose.yml
deleted file mode 100644
index 69a368f..0000000
--- a/sabnzbd/docker-compose.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-services:
-  sabnzbd:
-    hostname: nzb.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    volumes_from:
-    - "container:vols-dl"
-    labels:
-    # Websecure
-      traefik.http.routers.sabnzbd.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.sabnzbd.middlewares: lan-only@file
-      traefik.http.routers.sabnzbd.rule: Host(`nzb.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-    #   traefik.http.routers.sabnzbd-more.entrypoints: websecure
-    #   traefik.http.routers.sabnzbd-more.service: sabnzbd
-    #   traefik.http.routers.sabnzbd-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.sabnzbd-more.middlewares: lan-only@file
-    #   traefik.http.routers.sabnzbd-more.tls: true
-    #   traefik.http.routers.sabnzbd-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/sonarr/docker-compose.yml b/sonarr/docker-compose.yml
deleted file mode 100644
index 9008002..0000000
--- a/sonarr/docker-compose.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-services:
-  sonarr:
-    hostname: sonarr.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    volumes_from:
-    - "container:vols-arr"
-    labels:
-    # Websecure
-      traefik.http.routers.sonarr.middlewares: authentik_sysmgr@file
-    #  traefik.http.routers.sonarr.middlewares: lan-only@file
-      traefik.http.routers.sonarr-more.rule: Host(`sonarr.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-    #   traefik.http.routers.sonarr-more.entrypoints: websecure
-    #   traefik.http.routers.sonarr-more.service: sonarr
-    #   traefik.http.routers.sonarr-more.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.sonarr-more.middlewares: lan-only@file
-    #   traefik.http.routers.sonarr-more.tls: true
-    #   traefik.http.routers.sonarr-more.tls.certresolver: myresolver
\ No newline at end of file
diff --git a/syncthing/docker-compose.yml b/syncthing/docker-compose.yml
deleted file mode 100644
index edac563..0000000
--- a/syncthing/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-services:
-  syncthing:
-    hostname: syncthing.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    volumes_from:
-    - "container:vols-all"
-    volumes:
-    - "/mnt/szmedia/sync.root:/mnt/szmedia/sync.root"
-    labels:
-    # Websecure
-      traefik.http.routers.syncthing.middlewares: authentik_sysmgr@file
-      traefik.http.routers.syncthing.rule: Host(`sync.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
\ No newline at end of file
diff --git a/tautulli/docker-compose.yml b/tautulli/docker-compose.yml
deleted file mode 100644
index 1ae9968..0000000
--- a/tautulli/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-services:
-  tautulli:
-    hostname: tautulli.docker
-    environment:
-      PUID: "${SZ_USER_UID}"
-      PGID: "${SZ_USER_GID}"
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-    labels:
-    # Websecure
-      traefik.http.routers.tautulli.middlewares: authentik_sysmgr@file
-    #   traefik.http.routers.tautulli-more.rule: Host(`tautulli.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 73496ef..bc9f13c 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -17,7 +17,11 @@ services:
     - /srv/vaultwarden/data:/data
     labels:
       # Websecure
-      traefik.http.routers.vaultwarden.rule: Host(`vault.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
+      traefik.http.routers.vaultwarden.rule: Host(`www.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
+      # traefik.http.routers.vaultwarden-more.entrypoints: websecure
+      # traefik.http.routers.vaultwarden-more.service: vaultwarden
+      # traefik.http.routers.vaultwarden-more.tls: true
+      # traefik.http.routers.vaultwarden-more.tls.certresolver: myresolver
 networks:
   vaultwarden_pg_dockge:
     external: true