diff --git a/.gitignore b/.gitignore
index 49b651c..075b7e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ gitea/gitea-db/
 gitea/gitea-data/*
 n8n/n8n-data/*
 n8n/n8n-node-data/*
-adguardhome/data/*
+adguardhome/conf/*
 dockmon/data/*
 portainer/portainer_data/*
 metube/MeTube_downloads
diff --git a/adguardhome/compose.yaml b/adguardhome/compose.yaml
index 94f203c..af1bb78 100644
--- a/adguardhome/compose.yaml
+++ b/adguardhome/compose.yaml
@@ -9,10 +9,10 @@ services:
       - "853:853/tcp" # DNS over TLS
       # - "67:67/udp" # DHCP
       # - "68:68/tcp" # DHCP
-      # - "3000:3000/tcp"
+      # - "3000:3000/tcp" # Web UI
     volumes:
-      - ./data/work:/opt/adguardhome/work
-      - ./data/conf:/opt/adguardhome/conf
+      - data:/opt/adguardhome/work
+      - ./conf:/opt/adguardhome/conf
       - ./certs:/certs:ro
     labels:
       - "traefik.enable=true"
@@ -20,19 +20,16 @@ services:
       - "traefik.http.services.adguard.loadbalancer.server.port=3000"
       
       # Prod Router
-      - "traefik.http.routers.adguard.rule=Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)"
+      - "traefik.http.routers.adguard.rule=Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)"
       - "traefik.http.routers.adguard.entrypoints=websecure"
-      - "traefik.http.routers.adguard.middlewares=security-headers@file"
       - "traefik.http.routers.adguard.tls=true"
       # Local Router
       - "traefik.http.routers.adguard-local.rule=Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`)"
       - "traefik.http.routers.adguard-local.entrypoints=websecure"
-      - "traefik.http.routers.adguard-local.middlewares=security-headers@file"
       - "traefik.http.routers.adguard-local.tls=true"
       # Dev Router
       - "traefik.http.routers.adguard-dev.rule=Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)"
       - "traefik.http.routers.adguard-dev.entrypoints=websecure"
-      - "traefik.http.routers.adguard-dev.middlewares=security-headers@file"
       - "traefik.http.routers.adguard-dev.tls=true"
       # DoH Router
       - "traefik.http.routers.dns.rule=(Host(`dns.forust.xyz`) && PathPrefix(`/dns-query`))"
@@ -42,9 +39,11 @@ services:
       # Glance Metadata
       - glance.name=adguard
       - glance.url=https://adguard.forust.xyz/
-      - glance.description=AdGuard Home is a network-wide software for blocking ads.
+      - glance.description=AdGuard Home is a network-wide ad and trackers blocker.
     networks:
       - proxy
+volumes:
+  data:
 networks:
   proxy:
     external: true
diff --git a/authentik/compose.yaml b/authentik/compose.yaml
index ca933cd..b253eb1 100644
--- a/authentik/compose.yaml
+++ b/authentik/compose.yaml
@@ -48,20 +48,14 @@ services:
       # Prod Router
       - "traefik.http.routers.authentik-server.rule=Host(`auth.forust.xyz`)"
       - "traefik.http.routers.authentik-server.entrypoints=websecure"
-      - "traefik.http.routers.authentik-server.middlewares=security-headers@file"
-      - "traefik.http.routers.authentik-server.service=authentik-server"
       - "traefik.http.routers.authentik-server.tls=true"
       # Local Router
-      - "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`) || Host(`auth-dashboard.internal`)"
+      - "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`)"
       - "traefik.http.routers.authentik-server-local.entrypoints=websecure"
-      - "traefik.http.routers.authentik-server-local.middlewares=security-headers@file"
-      - "traefik.http.routers.authentik-server-local.service=authentik-server"
       - "traefik.http.routers.authentik-server-local.tls=true"
       # Dev Router
       - "traefik.http.routers.authentik-server-dev.rule=Host(`auth.gigaforust.internal`)"
       - "traefik.http.routers.authentik-server-dev.entrypoints=websecure"
-      - "traefik.http.routers.authentik-server-dev.middlewares=security-headers@file"
-      - "traefik.http.routers.authentik-server-dev.service=authentik-server"
       - "traefik.http.routers.authentik-server-dev.tls=true"
     networks:
       - proxy
diff --git a/checkmk/compose.yaml b/checkmk/compose.yaml
index 3b94f16..78c2a1d 100644
--- a/checkmk/compose.yaml
+++ b/checkmk/compose.yaml
@@ -22,16 +22,13 @@ services:
       # Prod Router
       - "traefik.http.routers.checkmk.rule=Host(`cmk.forust.xyz`)"
       - "traefik.http.routers.checkmk.entrypoints=websecure"
-      - "traefik.http.routers.checkmk.middlewares=security-headers@file"
       - "traefik.http.routers.checkmk.tls=true"
       # Local Router
       - "traefik.http.routers.checkmk-local.rule=Host(`cmk.workstation.internal`)"
       - "traefik.http.routers.checkmk-local.entrypoints=websecure"
-      - "traefik.http.routers.checkmk-local.middlewares=security-headers@file"
       - "traefik.http.routers.checkmk-local.tls=true"
       # Dev Router
       - "traefik.http.routers.checkmk-dev.rule=Host(`cmk.gigaforust.internal`)"
-      - "traefik.http.routers.checkmk-dev.middlewares=security-headers@file"
       - "traefik.http.routers.checkmk-dev.entrypoints=websecure"
       - "traefik.http.routers.checkmk-dev.tls=true"
     networks:
diff --git a/dockmon/compose.yaml b/dockmon/compose.yaml
index 243223b..ced6545 100644
--- a/dockmon/compose.yaml
+++ b/dockmon/compose.yaml
@@ -24,17 +24,14 @@ services:
          - "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)"
          - "traefik.http.routers.dockmon.entrypoints=websecure"
          - "traefik.http.routers.dockmon.middlewares=security-chain@file"
-         - "traefik.http.routers.dockmon.service=dockmon"
          - "traefik.http.routers.dockmon.tls=true"
          # Local Router
          - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)"
          - "traefik.http.routers.dockmon-local.entrypoints=websecure"
-         - "traefik.http.routers.dockmon-local.middlewares=security-headers@file"
          - "traefik.http.routers.dockmon-local.tls=true"
          # Dev Router
          - "traefik.http.routers.dockmon-dev.rule=Host(`dockmon.gigaforust.internal`)"
          - "traefik.http.routers.dockmon-dev.entrypoints=websecure"
-         - "traefik.http.routers.dockmon-dev.middlewares=security-chain@file"
          - "traefik.http.routers.dockmon-dev.tls=true"
 
          # Glance Metadata
diff --git a/downtify/compose.yaml b/downtify/compose.yaml
index b20b9ab..8be77ca 100644
--- a/downtify/compose.yaml
+++ b/downtify/compose.yaml
@@ -12,20 +12,18 @@ services:
       - traefik.http.services.downtify.loadbalancer.server.port=8000
 
       # Prod Router 
-      - traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)
-      - traefik.http.routers.downtify.entrypoints=websecure
-      - traefik.http.routers.downtify.middlewares=security-chain@file
-      - traefik.http.routers.downtify.tls=true
+      - "traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)"
+      - "traefik.http.routers.downtify.entrypoints=websecure"
+      - "traefik.http.routers.downtify.middlewares=security-chain@file"
+      - "traefik.http.routers.downtify.tls=true"
       # Local Router
-      - traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`) || Host(`downtify.internal`)
-      - traefik.http.routers.downtify-local.entrypoints=websecure
-      - traefik.http.routers.downtify-local.middlewares=security-headers@file
-      - traefik.http.routers.downtify-local.tls=true
+      - "traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`)"
+      - "traefik.http.routers.downtify-local.entrypoints=websecure"
+      - "traefik.http.routers.downtify-local.tls=true"
       # Dev Router
-      - traefik.http.routers.downtify-dev.rule=Host(`downtify.gigaforust.internal`)
-      - traefik.http.routers.downtify-dev.entrypoints=websecure
-      - traefik.http.routers.downtify-dev.middlewares=security-chain@file
-      - traefik.http.routers.downtify-dev.tls=true
+      - "traefik.http.routers.downtify-dev.rule=Host(`downtify.gigaforust.internal`)"
+      - "traefik.http.routers.downtify-dev.entrypoints=websecure"
+      - "traefik.http.routers.downtify-dev.tls=true"
     networks:
       - proxy
 networks:
diff --git a/errorpages/compose.yaml b/errorpages/compose.yaml
index 2171f4d..4ea3440 100644
--- a/errorpages/compose.yaml
+++ b/errorpages/compose.yaml
@@ -13,7 +13,6 @@ services:
       - "traefik.http.services.errorpage.loadbalancer.server.port=80"
       # Error handler middleware
       - "traefik.http.middlewares.error-pages.errors.status=400-599"
-      - "traefik.http.middlewares.error-pages.errors.service=errorpage"
       - "traefik.http.middlewares.error-pages.errors.query=/{status}.html"
 networks:
   proxy:
diff --git a/gitea/compose.yaml b/gitea/compose.yaml
index fefac70..d9f0dd0 100644
--- a/gitea/compose.yaml
+++ b/gitea/compose.yaml
@@ -37,17 +37,14 @@ services:
       # Prod Router
       - "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
-      - "traefik.http.routers.gitea.middlewares=security-headers@file"
       - "traefik.http.routers.gitea.tls=true"
       # Local Router
       - "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`)"
       - "traefik.http.routers.gitea-local.entrypoints=websecure"
-      - "traefik.http.routers.gitea-local.middlewares=security-headers@file"
       - "traefik.http.routers.gitea-local.tls=true"
       # Dev Router
       - "traefik.http.routers.gitea-dev.rule=Host(`gitea.gigaforust.internal`)"
       - "traefik.http.routers.gitea-dev.entrypoints=websecure"
-      - "traefik.http.routers.gitea-dev.middlewares=security-headers@file"
       - "traefik.http.routers.gitea-dev.tls=true"
       # SSH Router
       - "traefik.tcp.services.gitea.loadbalancer.server.port=22"
diff --git a/glance/compose.yaml b/glance/compose.yaml
index dc1ec97..347f377 100644
--- a/glance/compose.yaml
+++ b/glance/compose.yaml
@@ -12,22 +12,19 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=proxy"
-      # FIXME: traefik.services.glance.loadbalancer.server.port ??
-
+      - "traefik.http.services.glance.loadbalancer.server.port=8080"
+      
       # Prod Router
       - "traefik.http.routers.glance.rule=Host(`glance.forust.xyz`)"
       - "traefik.http.routers.glance.entrypoints=websecure"
-      - "traefik.http.routers.glance.middlewares=security-headers@file"
       - "traefik.http.routers.glance.tls=true"
       # Local Router
       - "traefik.http.routers.glance-local.rule=Host(`glance.workstation.internal`)"
       - "traefik.http.routers.glance-local.entrypoints=websecure"
-      - "traefik.http.routers.glance-local.middlewares=security-headers@file"
       - "traefik.http.routers.glance-local.tls=true"
       # Dev Router
       - "traefik.http.routers.glance-dev.rule=Host(`glance.gigaforust.internal`)"
       - "traefik.http.routers.glance-dev.entrypoints=websecure"
-      - "traefik.http.routers.glance-dev.middlewares=security-headers@file"
       - "traefik.http.routers.glance-dev.tls=true"
     networks:
       - proxy
diff --git a/homepages/compose.yaml b/homepages/compose.yaml
index 9187c0d..4bdf8b7 100644
--- a/homepages/compose.yaml
+++ b/homepages/compose.yaml
@@ -18,17 +18,14 @@ services:
       # Prod Router
       - "traefik.http.routers.forust-homepage.rule=Host(`forust.xyz`)"
       - "traefik.http.routers.forust-homepage.entrypoints=websecure"
-      - "traefik.http.routers.forust-homepage.middlewares=security-headers@file"
       - "traefik.http.routers.forust-homepage.tls=true"
       # Local Router
       - "traefik.http.routers.forust-homepage-local.rule=Host(`landing.workstation.internal`)"
       - "traefik.http.routers.forust-homepage-local.entrypoints=websecure"
-      - "traefik.http.routers.forust-homepage-local.middlewares=security-headers@file"
       - "traefik.http.routers.forust-homepage-local.tls=true"
       # Dev Router
       - "traefik.http.routers.forust-homepage-dev.rule=Host(`landing.gigaforust.internal`)"
       - "traefik.http.routers.forust-homepage-dev.entrypoints=websecure"
-      - "traefik.http.routers.forust-homepage-dev.middlewares=security-headers@file"
       - "traefik.http.routers.forust-homepage-dev.tls=true"
   xdfnx:
     build:
@@ -47,17 +44,14 @@ services:
       # Prod Router
       - "traefik.http.routers.xdfnx.rule=Host(`xdfnx.cfd`)"
       - "traefik.http.routers.xdfnx.entrypoints=websecure"
-      - "traefik.http.routers.xdfnx.middlewares=security-headers@file"
       - "traefik.http.routers.xdfnx.tls=true"
       # Local Router
       - "traefik.http.routers.xdfnx-local.rule=Host(`xdfnx.workstation.internal`)"
       - "traefik.http.routers.xdfnx-local.entrypoints=websecure"
-      - "traefik.http.routers.xdfnx-local.middlewares=security-headers@file"
       - "traefik.http.routers.xdfnx-local.tls=true"
       # Dev Router
       - "traefik.http.routers.xdfnx-dev.rule=Host(`xdfnx.gigaforust.internal`)"
       - "traefik.http.routers.xdfnx-dev.entrypoints=websecure"
-      - "traefik.http.routers.xdfnx-dev.middlewares=security-headers@file"
       - "traefik.http.routers.xdfnx-dev.tls=true"
     networks:
       - proxy
diff --git a/metube/compose.yaml b/metube/compose.yaml
index 133f0e9..a2ec61b 100644
--- a/metube/compose.yaml
+++ b/metube/compose.yaml
@@ -25,12 +25,10 @@ services:
       # Local Router
       - "traefik.http.routers.metube-local.rule=Host(`metube.workstation.internal`)"
       - "traefik.http.routers.metube-local.entrypoints=websecure"
-      - "traefik.http.routers.metube-local.middlewares=security-headers@file"
       - "traefik.http.routers.metube-local.tls=true"
       # Dev Router
       - "traefik.http.routers.metube-dev.rule=Host(`metube.gigaforust.internal`)"
       - "traefik.http.routers.metube-dev.entrypoints=websecure"
-      - "traefik.http.routers.metube-dev.middlewares=security-chain@file"
       - "traefik.http.routers.metube-dev.tls=true"
     networks:
       - proxy
diff --git a/n8n/.env.example b/n8n/.env.example
new file mode 100644
index 0000000..c6937ca
--- /dev/null
+++ b/n8n/.env.example
@@ -0,0 +1,8 @@
+N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
+N8N_PORT=5678
+N8N_RUNNERS_ENABLED=true
+NODE_ENV=production
+GENERIC_TIMEZONE=Etc/UTC
+TZ=Etc/UTC
+N8N_SECURE_COOKIE=false
+N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE=true
\ No newline at end of file
diff --git a/n8n/compose.yaml b/n8n/compose.yaml
index ff73617..9140fec 100644
--- a/n8n/compose.yaml
+++ b/n8n/compose.yaml
@@ -3,58 +3,40 @@ services:
     image: docker.n8n.io/n8nio/n8n
     container_name: n8n
     restart: unless-stopped
-    environment:
-      - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true
-      - N8N_PORT=5678
-      - N8N_RUNNERS_ENABLED=true
-      - NODE_ENV=production
-      - GENERIC_TIMEZONE=Europe/Bratislava
-      - TZ=Europe/Bratislava
-      - N8N_SECURE_COOKIE=false
-      - N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE=true
+    env_file:
+      - .env
     volumes:
-      - ./n8n-node-data:/home/node/.n8n
-      - ./n8n-files:/files
-    extra_hosts:
-      - "enterprise.n8n.io:104.26.13.187"
-      - "enterprise.n8n.io:104.26.12.187"
-      - "enterprise.n8n.io:172.67.68.102"
-    dns:
-      - 1.1.1.1
-      - 8.8.8.8
+      - data:/home/node/.n8n
+      - files:/files
     networks:
       - proxy
       - n8n
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=proxy"
+      - "traefik.http.services.n8n.loadbalancer.server.port=5678"
 
       # Prod Router
       - "traefik.http.routers.n8n.rule=Host(`n8n.forust.xyz`)"
       - "traefik.http.routers.n8n.entrypoints=websecure"
-      - "traefik.http.routers.n8n.middlewares=security-headers@file"
-      - "traefik.http.routers.n8n.service=n8n"
+      - "traefik.http.routers.n8n.middlewares=security-chain@file"
       - "traefik.http.routers.n8n.tls=true"
-      - "traefik.http.services.n8n.loadbalancer.server.port=5678"
-
       # Local Router
-      - "traefik.http.routers.n8n-local.rule=Host(`n8n.workstation.internal`) || Host(`n8n.internal`)"
+      - "traefik.http.routers.n8n-local.rule=Host(`n8n.workstation.internal`)"
       - "traefik.http.routers.n8n-local.entrypoints=websecure"
-      - "traefik.http.routers.n8n-local.middlewares=security-headers@file"
-      - "traefik.http.routers.n8n-local.service=n8n"
       - "traefik.http.routers.n8n-local.tls=true"
-
       # Dev Router
       - "traefik.http.routers.n8n-dev.rule=Host(`n8n.gigaforust.internal`)"
       - "traefik.http.routers.n8n-dev.entrypoints=websecure"
-      - "traefik.http.routers.n8n-dev.middlewares=security-headers@file"
-      - "traefik.http.routers.n8n-dev.service=n8n"
       - "traefik.http.routers.n8n-dev.tls=true"
 
       - glance.name=n8n
       - glance.icon=si:n8n
       - glance.url=https://n8n.forust.xyz/
       - glance.description=n8n is a workflow automation tool that enables you to connect various apps and services to automate tasks and processes.
+volumes:
+  data:
+  files:
 networks:
   n8n:
     external: false
diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml
index 874bc24..895c043 100644
--- a/nextcloud/compose.yaml
+++ b/nextcloud/compose.yaml
@@ -26,18 +26,14 @@ services:
       # Prod Router
       # - "traefik.http.routers.nextcloud-aio.rule=Host(`naio.forust.xyz`)"
       # - "traefik.http.routers.nextcloud-aio.entrypoints=websecure"
-      # - "traefik.http.routers.nextcloud-aio.middlewares=security-chain@file"
-      # - "traefik.http.routers.nextcloud-aio.service=nextcloud-aio"
       # - "traefik.http.routers.nextcloud-aio.tls=true"
       # Local Router
       - "traefik.http.routers.nextcloud-aio-local.rule=Host(`naio.workstation.internal`)"
       - "traefik.http.routers.nextcloud-aio-local.entrypoints=websecure"
-      - "traefik.http.routers.nextcloud-aio-local.middlewares=security-headers@file"
       - "traefik.http.routers.nextcloud-aio-local.tls=true"
       # Dev Router
       - "traefik.http.routers.nextcloud-aio-dev.rule=Host(`naio.gigaforust.internal`)"
       - "traefik.http.routers.nextcloud-aio-dev.entrypoints=websecure"
-      - "traefik.http.routers.nextcloud-aio-dev.middlewares=security-headers@file"
       - "traefik.http.routers.nextcloud-aio-dev.tls=true"
 
       # Glance Metadata
diff --git a/penpot/compose.yaml b/penpot/compose.yaml
index 9f50231..e4dd3fd 100644
--- a/penpot/compose.yaml
+++ b/penpot/compose.yaml
@@ -60,29 +60,6 @@ volumes:
     # penpot_minio:
 
 services:
-  ## Traefik service declaration example. Consider using it if you are going to expose
-  ## penpot to the internet, or a different host than `localhost`.
-
-  # traefik:
-  #   image: traefik:v3.3
-  #   networks:
-  #     - penpot
-  #   command:
-  #     - "--api.insecure=true"
-  #     - "--entryPoints.web.address=:80"
-  #     - "--providers.docker=true"
-  #     - "--providers.docker.exposedbydefault=false"
-  #     - "--entryPoints.websecure.address=:443"
-  #     - "--certificatesresolvers.letsencrypt.acme.tlschallenge=true"
-  #     - "--certificatesresolvers.letsencrypt.acme.email=<EMAIL_ADDRESS>"
-  #     - "--certificatesresolvers.letsencrypt.acme.storage=/traefik/acme.json"
-  #   volumes:
-  #     - "penpot_traefik:/traefik"
-  #     - "/var/run/docker.sock:/var/run/docker.sock"
-  #   ports:
-  #     - "80:80"
-  #     - "443:443"
-
   penpot-frontend:
     image: "penpotapp/frontend:${PENPOT_VERSION:-latest}"
     restart: always
@@ -108,17 +85,14 @@ services:
       # Prod Router
       - "traefik.http.routers.penpot.rule=Host(`penpot.forust.xyz`)"
       - "traefik.http.routers.penpot.entrypoints=websecure"
-      - "traefik.http.routers.penpot.middlewares=security-headers@file"
       - "traefik.http.routers.penpot.tls=true"
       # Local Router
       - "traefik.http.routers.penpot-local.rule=Host(`penpot.workstation.internal`)"
       - "traefik.http.routers.penpot-local.entrypoints=websecure"
-      - "traefik.http.routers.penpot-local.middlewares=security-headers@file"
       - "traefik.http.routers.penpot-local.tls=true"
       # Dev Router
       - "traefik.http.routers.penpot-dev.rule=Host(`penpot.gigaforust.internal`)"
       - "traefik.http.routers.penpot-dev.entrypoints=websecure"
-      - "traefik.http.routers.penpot-dev.middlewares=security-headers@file"
       - "traefik.http.routers.penpot-dev.tls=true"
     environment:
       <<: [ *penpot-flags, *penpot-http-body-size ]
diff --git a/portainer/compose.yaml b/portainer/compose.yaml
index 36423f1..f6164cc 100644
--- a/portainer/compose.yaml
+++ b/portainer/compose.yaml
@@ -8,7 +8,7 @@ services:
       - data:/data
     ports:
       - 9443:9443
-      # - 8000:8000  # Remove if you do not intend to use Edge Agents
+      # - 9077:8000  # Remove if you do not intend to use Edge Agents
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=proxy"
@@ -19,23 +19,20 @@ services:
       # Prod Router
       - "traefik.http.routers.portainer.rule=Host(`portainer.forust.xyz`)"
       - "traefik.http.routers.portainer.entrypoints=websecure"
-      - "traefik.http.routers.portainer.middlewares=security-headers@file"
       - "traefik.http.routers.portainer.tls=true"
       # Local Router
       - "traefik.http.routers.portainer-local.rule=Host(`portainer.workstation.internal`)"
       - "traefik.http.routers.portainer-local.entrypoints=websecure"
-      - "traefik.http.routers.portainer-local.middlewares=security-headers@file"
       - "traefik.http.routers.portainer-local.tls=true"
       # Dev Router
       - "traefik.http.routers.portainer-dev.rule=Host(`portainer.gigaforust.internal`)"
       - "traefik.http.routers.portainer-dev.entrypoints=websecure"
-      - "traefik.http.routers.portainer-dev.middlewares=security-headers@file"
       - "traefik.http.routers.portainer-dev.tls=true"
 
       # Glance Metadata
       - glance.name=Portainer
       - glance.url=https://portainer.forust.xyz/
-      - glance.description=Portainer is a lightweight management UI which allows you to easily manage your Docker environments.
+      - glance.description=Portainer is a docker management UI.
     networks:
       - proxy
 volumes:
diff --git a/termix/compose.yaml b/termix/compose.yaml
index f840570..5078a02 100644
--- a/termix/compose.yaml
+++ b/termix/compose.yaml
@@ -17,17 +17,14 @@ services:
       # Prod Router
       - "traefik.http.routers.termix.rule=Host(`termix.forust.xyz`)"
       - "traefik.http.routers.termix.entrypoints=websecure"
-      - "traefik.http.routers.termix.middlewares=security-headers@file"
       - "traefik.http.routers.termix.tls=true"
       # Local Router
       - "traefik.http.routers.termix-local.rule=Host(`termix.workstation.internal`)"
       - "traefik.http.routers.termix-local.entrypoints=websecure"
-      - "traefik.http.routers.termix-local.middlewares=security-headers@file"
       - "traefik.http.routers.termix-local.tls=true"
       # Dev Router
       - "traefik.http.routers.termix-dev.rule=Host(`termix.gigaforust.internal`)"
       - "traefik.http.routers.termix-dev.entrypoints=websecure"
-      - "traefik.http.routers.termix-dev.middlewares=security-headers@file"
       - "traefik.http.routers.termix-dev.tls=true"
     networks:
       - proxy
diff --git a/traefik/compose.yaml b/traefik/compose.yaml
index bf740e0..ce9f7ad 100644
--- a/traefik/compose.yaml
+++ b/traefik/compose.yaml
@@ -17,10 +17,11 @@ services:
 
       # EntryPoints
       - "--entryPoints.web.address=:80"
-      # - "--entryPoints.web.http.middlewares=error-pages@docker"
+      - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
       - "--entryPoints.web.http.redirections.entryPoint.scheme=https"
+      - "--entryPoints.web.http.redirections.entryPoint.permanent=true"
       - "--entryPoints.websecure.address=:443"
-      - "--entryPoints.websecure.http.middlewares=error-pages@docker"
+      - "--entryPoints.websecure.http.middlewares=error-pages@docker,security-headers@file"
       - "--entryPoints.websecure.http.tls=true"
       - "--entryPoints.ssh.address=:2221"
 
@@ -53,20 +54,18 @@ services:
       # Local Router
       - "traefik.http.routers.traefik-dashboard-local.rule=Host(`traefik.workstation.internal`)"
       - "traefik.http.routers.traefik-dashboard-local.entrypoints=websecure"
-      - "traefik.http.routers.traefik-dashboard-local.middlewares=security-headers@file"
       - "traefik.http.routers.traefik-dashboard-local.service=api@internal"
       - "traefik.http.routers.traefik-dashboard-local.tls=true"
       # Dev Router
       - "traefik.http.routers.traefik-dashboard-dev.rule=Host(`traefik.gigaforust.internal`)"
       - "traefik.http.routers.traefik-dashboard-dev.entrypoints=websecure"
-      - "traefik.http.routers.traefik-dashboard-dev.middlewares=security-headers@file"
       - "traefik.http.routers.traefik-dashboard-dev.service=api@internal"
       - "traefik.http.routers.traefik-dashboard-dev.tls=true"
 
       # Glance Metadata
       - glance.name=Traefik
       - glance.url=https://traefik.forust.xyz/
-      - glance.description=Traefik is a modern reverse proxy and load balancer
+      - glance.description=Traefik is a modern, beloved and hardcore reverse proxy and load balancer
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./dynamic:/etc/traefik/dynamic:ro