diff --git a/config-templates/traefik/dynamic/external-host-production.yml b/config-templates/traefik/dynamic/local-host-production.yml
similarity index 90%
rename from config-templates/traefik/dynamic/external-host-production.yml
rename to config-templates/traefik/dynamic/local-host-production.yml
index deda057..7dfce7b 100644
--- a/config-templates/traefik/dynamic/external-host-production.yml
+++ b/config-templates/traefik/dynamic/local-host-production.yml
@@ -22,16 +22,16 @@ http:
         - sablier-${SERVER_HOSTNAME}-bookstack@file
         - authelia@docker
     
-    vaultwarden-${SERVER_HOSTNAME}:
-      rule: "Host(`vault.${DOMAIN}`)"
+    bitwarden-${SERVER_HOSTNAME}:
+      rule: "Host(`bitwarden.${DOMAIN}`)"
       entryPoints:
         - websecure
-      service: vaultwarden-${SERVER_HOSTNAME}
+      service: bitwarden-${SERVER_HOSTNAME}
       tls:
         certResolver: letsencrypt
-      # SSO disabled for browser extension and mobile app compatibility
-      # middlewares:
-      #   - sablier-${SERVER_HOSTNAME}-vaultwarden@file
+      middlewares:
+        - sablier-${SERVER_HOSTNAME}-bitwarden@file
+        - authelia@docker
 
     calibre-web-${SERVER_HOSTNAME}:
       rule: "Host(`calibre.${DOMAIN}`)"
@@ -56,7 +56,7 @@ http:
         - authelia@docker
 
     dockge-${SERVER_HOSTNAME}:
-      rule: "Host(`jarvis.${DOMAIN}`)"
+      rule: "Host(`${SERVER_HOSTNAME}.${DOMAIN}`)"
       entryPoints:
         - websecure
       service: dockge-${SERVER_HOSTNAME}
@@ -108,6 +108,18 @@ http:
         - sablier-${SERVER_HOSTNAME}-duplicati@file
         - authelia@docker
 
+    ez-assistant:
+      rule: "Host(`assistant.${DOMAIN}`)"
+      entryPoints:
+        - websecure
+      tls:
+        certResolver: letsencrypt
+      middlewares:
+        - authelia@docker
+        # - sablier-${SERVER_HOSTNAME}-assistant@file
+        - ez-assistant-websocket
+      service: ez-assistant
+
     formio-${SERVER_HOSTNAME}:
       rule: "Host(`formio.${DOMAIN}`)"
       entryPoints:
@@ -131,7 +143,7 @@ http:
         - authelia@docker
 
     glances-${SERVER_HOSTNAME}:
-      rule: "Host(`glances.jarvis.${DOMAIN}`)"
+      rule: "Host(`glances.${SERVER_HOSTNAME}.${DOMAIN}`)"
       entryPoints:
         - websecure
       service: glances-${SERVER_HOSTNAME}
@@ -142,7 +154,7 @@ http:
         - authelia@docker
 
     homepage-${SERVER_HOSTNAME}:
-      rule: "Host(`homepage.jarvis.${DOMAIN}`)"
+      rule: "Host(`homepage.${SERVER_HOSTNAME}.${DOMAIN}`)"
       entryPoints:
         - websecure
       service: homepage-${SERVER_HOSTNAME}
@@ -261,7 +273,7 @@ http:
         - authelia@docker
 
     qbittorrent-${SERVER_HOSTNAME}:
-      rule: "Host(`torrents.${DOMAIN}`)"
+      rule: "Host(`qbit.${DOMAIN}`)"
       entryPoints:
         - websecure
       service: qbittorrent-${SERVER_HOSTNAME}
@@ -293,6 +305,17 @@ http:
         - sablier-${SERVER_HOSTNAME}-unmanic@file
         - authelia@docker
 
+    vaultwarden-${SERVER_HOSTNAME}:
+      rule: "Host(`vault.${DOMAIN}`)"
+      entryPoints:
+        - websecure
+      service: vaultwarden-${SERVER_HOSTNAME}
+      tls:
+        certResolver: letsencrypt
+      # SSO disabled for browser extension and mobile app compatibility
+      middlewares:
+        - sablier-${SERVER_HOSTNAME}-vaultwarden@file
+
     wordpress-${SERVER_HOSTNAME}:
       rule: "Host(`knot-u.${DOMAIN}`)"
       entryPoints:
@@ -304,7 +327,6 @@ http:
         - sablier-${SERVER_HOSTNAME}-wordpress@file
         - authelia@file
 
-# Arr Services (no SSO for media apps)
     
     jellyseerr-${SERVER_HOSTNAME}:
       rule: "Host(`jellyseerr.${DOMAIN}`)"
@@ -384,7 +406,23 @@ http:
         - authelia@docker
 
 
-# Service Definitions
+
+
+# Middleware Definitions
+  middlewares:
+    ez-assistant-websocket:
+      headers:
+        accessControlAllowHeaders:
+          - "Connection"
+          - "Upgrade"
+        accessControlAllowMethods:
+          - "GET"
+          - "POST"
+          - "OPTIONS"
+        accessControlMaxAge: 86400
+
+
+
   services:
     backrest-${SERVER_HOSTNAME}:
       loadBalancer:
@@ -392,10 +430,10 @@ http:
           - url: "http://192.168.4.11:9898"
         passHostHeader: true
 
-    vaultwarden-${SERVER_HOSTNAME}:
+    bitwarden-${SERVER_HOSTNAME}:
       loadBalancer:
         servers:
-          - url: "http://192.168.4.11:8091"
+          - url: "http://192.168.4.11:8000"
         passHostHeader: true
 
     bookstack-${SERVER_HOSTNAME}:
@@ -446,6 +484,12 @@ http:
           - url: "http://192.168.4.11:8200"
         passHostHeader: true
 
+    ez-assistant:
+      loadbalancer:
+        servers:
+          - url: "http://192.168.4.11:18789"  # Internal IP of ${SERVER_HOSTNAME} server
+        passHostHeader: true
+
     formio-${SERVER_HOSTNAME}:
       loadBalancer:
         servers:
@@ -527,7 +571,7 @@ http:
     openwebui-${SERVER_HOSTNAME}:
       loadBalancer:
         servers:
-          - url: "http://192.168.4.11:3000"
+          - url: "http://192.168.4.11:3004"
         passHostHeader: true
 
     qbittorrent-${SERVER_HOSTNAME}:
@@ -548,6 +592,12 @@ http:
           - url: "http://192.168.4.11:8889"
         passHostHeader: true
 
+    vaultwarden-${SERVER_HOSTNAME}:
+      loadBalancer:
+        servers:
+          - url: "http://192.168.4.11:8091"
+        passHostHeader: true
+
     wordpress-${SERVER_HOSTNAME}:
       loadBalancer:
         servers:
diff --git a/config-templates/traefik/dynamic/sablier.yml b/config-templates/traefik/dynamic/sablier.yml
index a08b23c..a1e8e58 100644
--- a/config-templates/traefik/dynamic/sablier.yml
+++ b/config-templates/traefik/dynamic/sablier.yml
@@ -116,6 +116,18 @@ http:
             theme: ghost
             show-details-by-default: true
 
+    sablier-${SERVER_HOSTNAME}-assistant:
+      plugin:
+        sablier:
+          sablierUrl: http://sablier-service:10000
+          group: ${SERVER_HOSTNAME}-assistant
+          sessionDuration: 30m
+          ignoreUserAgent: curl
+          dynamic:
+            displayName: EZ-Assistant
+            theme: ghost
+            show-details-by-default: true
+
     sablier-${SERVER_HOSTNAME}-formio:
       plugin:
         sablier:
@@ -232,7 +244,7 @@ http:
           sessionDuration: 5m
           ignoreUserAgent: curl
           dynamic:
-            displayName: MediaWiki
+            displayName: mediawiki
             theme: ghost
             show-details-by-default: true