diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index cf8112d..9eeaaf1 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -57,6 +57,9 @@ services:
       RTL_SSO: 1
       RTL_COOKIE_PATH: /data/.cookie
       LOGOUT_REDIRECT_LINK: /server/services
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml
index 54f995b..595dccc 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml
@@ -57,7 +57,7 @@ services:
     expose:
       - "3000"
     labels:
-      traefik.enable: true
+      traefik.enable: "true"
       traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     links:
       - eclair_bitcoin
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index bd03248..41fe317 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -68,6 +68,9 @@ services:
       - "lnd_bitcoin_rtl_datadir:/data"
     expose:
       - "3000"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
     links:
       - lnd_bitcoin
 
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index 2f1582d..c39f617 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -20,6 +20,10 @@ services:
       BTCPAY_DEBUGLOG: btcpay.log
       BTCPAY_UPDATEURL: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest
       BTCPAY_DOCKERDEPLOYMENT: "true"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.btcpayserver.rule: Host(`${BTCPAY_HOST}`)
+      # Traefic can not accept list from BTCPAY_ADDITIONAL_HOSTS, see Traefik/README.md
     links:
       - postgres
     volumes:
diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml
index 00f01f5..ed5df49 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml
@@ -21,6 +21,9 @@ services:
       VIRTUAL_HOST: ${BTCTRANSMUTER_HOST}
       VIRTUAL_HOST_NAME: "btctransmuter"
       TRANSMUTER_BTCPayAuthServer: "http://btcpayserver:49392"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.btctransmuter.rule: Host(`${BTCPAY_HOST}`) && (Path(`/btctransmuter`) || PathPrefix(`/btctransmuter/`))
     expose:
       - "80"
     links:
diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
index a9fc5d0..706df8e 100644
--- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
@@ -19,6 +19,9 @@ services:
       NO_CLIENT_ACCOUNTS: "true"
       LOG_LEVEL: debug
       LOGOUT_URL: "/server/services/thunderhub/BTC"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.bitcoin_thub.rule: Host(`${BTCPAY_HOST}`) && (Path(`/thub`) || PathPrefix(`/thub/`))
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd"
       - "lnd_bitcoin_thub_datadir:/data"
diff --git a/docker-compose-generator/docker-fragments/traefik.yml b/docker-compose-generator/docker-fragments/traefik.yml
index 11aa774..95acbd7 100644
--- a/docker-compose-generator/docker-fragments/traefik.yml
+++ b/docker-compose-generator/docker-fragments/traefik.yml
@@ -13,23 +13,6 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "../Traefik/traefik.yml:/traefik.yml"
       - "traefik_data:/data"
-  bitcoin_rtl:
-      labels:
-        traefik.enable: true
-        traefik.http.routers.bitcoin_rtl.rule: Host(`${BTCPAY_HOST}`) && (Path(`/rtl`) || PathPrefix(`/rtl/`))
-  btcpayserver:
-    labels:
-      traefik.enable: true
-      traefik.http.routers.btcpayserver.rule: Host(`${BTCPAY_HOST}`)
-      # Traefic can not accept list from BTCPAY_ADDITIONAL_HOSTS, see Traefik/README.md
-  btctransmuter:
-    labels:
-      traefik.enable: true
-      traefik.http.routers.btctransmuter.rule: Host(`${BTCPAY_HOST}`) && (Path(`/btctransmuter`) || PathPrefix(`/btctransmuter/`))
-  bitcoin_thub:
-    labels:
-      traefik.enable: true
-      traefik.http.routers.bitcoin_thub.rule: Host(`${BTCPAY_HOST}`) && (Path(`/thub`) || PathPrefix(`/thub/`))
 volumes:
   traefik_data: