diff --git a/docker-templates/backrest/docker-compose.yml b/docker-templates/backrest/docker-compose.yml
index 9efe511..32b7278 100644
--- a/docker-templates/backrest/docker-compose.yml
+++ b/docker-templates/backrest/docker-compose.yml
@@ -49,7 +49,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/backrest.svg
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/backrest-light.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
diff --git a/docker-templates/bookstack/docker-compose.yml b/docker-templates/bookstack/docker-compose.yml
index 13335d3..f9f0357 100644
--- a/docker-templates/bookstack/docker-compose.yml
+++ b/docker-templates/bookstack/docker-compose.yml
@@ -69,7 +69,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/bookstack.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/calibre-web/docker-compose.yml b/docker-templates/calibre-web/docker-compose.yml
index 255e67a..04e940e 100644
--- a/docker-templates/calibre-web/docker-compose.yml
+++ b/docker-templates/calibre-web/docker-compose.yml
@@ -42,7 +42,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/calibre-web.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/core/.env b/docker-templates/core/.env
index a6e92b4..cae7cb4 100644
--- a/docker-templates/core/.env
+++ b/docker-templates/core/.env
@@ -27,9 +27,6 @@ AUTHELIA_SESSION_SECRET=
 AUTHELIA_STORAGE_ENCRYPTION_KEY=
 AUTHELIA_ADMIN_PASSWORD_HASH=
 
-TRAEFIK_HOST_LABEL=traefik.http.routers.traefik.rule=Host(`traefik.${SUBDOMAIN}.duckdns.org`)
-AUTHELIA_HOST_LABEL=traefik.http.routers.authelia.rule=Host(`auth.${SUBDOMAIN}.duckdns.org`)
-AUTHELIA_FORWARD_AUTH_LABEL=traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${SUBDOMAIN}.duckdns.org/
 # #############################################################
 # Container Labels
 
@@ -39,18 +36,6 @@ AUTHELIA_FORWARD_AUTH_LABEL=traefik.http.middlewares.authelia.forwardauth.addres
 # For example HOST_LABEL=traefik.http.routers.${SERVICE_NAME}.rule=Host(`${PROXY_URL}`)
 # Notice the use of backticks instead of single quotes around ${PROXY_URL}
 
-TRAEFIK_ENABLE_LABEL=traefik.enable=true
-HOST_LABEL=traefik.http.routers.${SERVICE_NAME}.rule=Host(`${PROXY_URL}`)
-ICON_LABEL=com.getarcaneapp.arcane.icon=${ICON_URL}
-LOADBALANCER_LABEL=traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${INTERNAL_PORT}
-
-TRAEFIK_NETWORK_LABEL=traefik.docker.network=traefik-network
-ENTRYPOINT_LABEL=traefik.http.routers.${SERVICE_NAME}.entrypoints=websecure
-CERT_LABEL=traefik.http.routers.${SERVICE_NAME}.tls.certresolver=letsencrypt
-
-AUTHELIA_LABEL=traefik.http.routers.${SERVICE_NAME}.middlewares=authelia@docker
-WATCHTOWER_ENABLE_LABEL=com.centurylinklabs.watchtower.enable=true
-
-
-
-
+TRAEFIK_HOST_LABEL=traefik.http.routers.traefik.rule=Host(`traefik.${SUBDOMAIN}.duckdns.org`)
+AUTHELIA_HOST_LABEL=traefik.http.routers.authelia.rule=Host(`auth.${SUBDOMAIN}.duckdns.org`)
+AUTHELIA_FORWARD_AUTH_LABEL=traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${SUBDOMAIN}.duckdns.org/
diff --git a/docker-templates/dokuwiki/docker-compose.yml b/docker-templates/dokuwiki/docker-compose.yml
index 9f8bb0a..3f3d848 100644
--- a/docker-templates/dokuwiki/docker-compose.yml
+++ b/docker-templates/dokuwiki/docker-compose.yml
@@ -38,7 +38,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/dokuwiki.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/dozzle/docker-compose.yml b/docker-templates/dozzle/docker-compose.yml
index ec32f21..50da2d7 100644
--- a/docker-templates/dozzle/docker-compose.yml
+++ b/docker-templates/dozzle/docker-compose.yml
@@ -45,7 +45,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/dozzle.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
diff --git a/docker-templates/gitea/docker-compose.yml b/docker-templates/gitea/docker-compose.yml
index d85bbf9..ffce287 100644
--- a/docker-templates/gitea/docker-compose.yml
+++ b/docker-templates/gitea/docker-compose.yml
@@ -71,7 +71,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/gitea.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/glances/docker-compose.yml b/docker-templates/glances/docker-compose.yml
index 042ba69..6b8a674 100644
--- a/docker-templates/glances/docker-compose.yml
+++ b/docker-templates/glances/docker-compose.yml
@@ -38,7 +38,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/glances.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/homarr/docker-compose.yml b/docker-templates/homarr/docker-compose.yml
index bb2930a..2ab156a 100644
--- a/docker-templates/homarr/docker-compose.yml
+++ b/docker-templates/homarr/docker-compose.yml
@@ -42,7 +42,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/homarr.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/homepage/docker-compose.yml b/docker-templates/homepage/docker-compose.yml
index 51568bb..e87216d 100644
--- a/docker-templates/homepage/docker-compose.yml
+++ b/docker-templates/homepage/docker-compose.yml
@@ -40,7 +40,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/homepage.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/jupyter/docker-compose.yml b/docker-templates/jupyter/docker-compose.yml
index 293b1af..ee202c3 100644
--- a/docker-templates/jupyter/docker-compose.yml
+++ b/docker-templates/jupyter/docker-compose.yml
@@ -46,7 +46,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/jupyter.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/mealie/docker-compose.yml b/docker-templates/mealie/docker-compose.yml
index 6d6b120..6f8db26 100644
--- a/docker-templates/mealie/docker-compose.yml
+++ b/docker-templates/mealie/docker-compose.yml
@@ -40,7 +40,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/mealie.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/metube/compose.yaml b/docker-templates/metube/compose.yaml
index ce155c3..e6e4a12 100644
--- a/docker-templates/metube/compose.yaml
+++ b/docker-templates/metube/compose.yaml
@@ -27,7 +27,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/metube.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/sablier/docker-compose.yml b/docker-templates/sablier/docker-compose.yml
index c9ec63c..6c72101 100644
--- a/docker-templates/sablier/docker-compose.yml
+++ b/docker-templates/sablier/docker-compose.yml
@@ -21,4 +21,4 @@ networks:
     external: true
 
 x-arcane:
-  icon: ${ICON_URL}
\ No newline at end of file
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/sablier.svg
\ No newline at end of file
diff --git a/docker-templates/valutwarden/docker-compose.yml b/docker-templates/valutwarden/docker-compose.yml
index 2a677d0..b59c41f 100644
--- a/docker-templates/valutwarden/docker-compose.yml
+++ b/docker-templates/valutwarden/docker-compose.yml
@@ -51,7 +51,7 @@ x-dockge:
     - ${LOCAL_URL}
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/vaultwarden-light.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}
\ No newline at end of file
diff --git a/docker-templates/yarnl/compose.yaml b/docker-templates/yarnl/compose.yaml
index e95a130..01d5022 100644
--- a/docker-templates/yarnl/compose.yaml
+++ b/docker-templates/yarnl/compose.yaml
@@ -74,7 +74,7 @@ x-dockge:
     - https://ravelry.com
 
 x-arcane:
-  icon: ${ICON_URL}
+  icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/svg/yarnl.svg
   urls:
     - https://${PROXY_URL}
     - ${LOCAL_URL}