diff --git a/docker-compose.yml b/docker-compose.yml
index cd6eec2..c6e3e97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,38 @@ version: '3'
 
 services:
 
+  milvert-nginx:
+    container_name: milvert-nginx
+    image: nginx:latest
+    restart: always
+    networks:
+      - backend
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.milvert-ssl.redirectscheme.scheme=https"
+      # HTTP
+      - "traefik.http.routers.milvert.rule=Host(`${DOMAIN}`)"
+      - "traefik.http.routers.milvert.priority=1"
+      - "traefik.http.routers.milvert.entrypoints=web"
+      - "traefik.http.routers.mainsite-http.middlewares=milvert-ssl@docker"
+
+        #- "traefik.http.routers.milvert.middlewares=redirect@file"
+
+        #HTTPS
+      - "traefik.http.routers.milvert-secure.entrypoints=web-secure"
+      - "traefik.http.routers.milvert-secure.rule=Host(`www.${DOMAIN}`, `${DOMAIN}`)"
+      - "traefik.http.routers.milvert-secure.priority=1"
+        # SSL
+      - "traefik.http.routers.milvert-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.milvert-secure.tls=true"
+
+
+    volumes:
+      - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d"
+      - "${DIR}/milvert-nginx/html:/html"
+
+
+
   zigbee2mqtt:
     container_name: zigbee2mqtt
     networks:
@@ -79,23 +111,22 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
-      - "traefik.http.routers.whoami.entrypoints=web"
       - "traefik.http.routers.whoami-secure.entrypoints=web-secure"
       - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)"
       - "traefik.http.routers.whoami-secure.tls.certresolver=milvert"
 
   mqtt:
-    image: eclipse-mosquitto:1.6.7
+    image: eclipse-mosquitto:1.6.8
     container_name: mqtt
     networks:
       - frontend
       - backend
     restart: always
     ports:
-      - "1885:1883"
+      - "1883:1883"
       - "9001:9001"
     volumes:
-      #- ${DIR}/mosquitto/config:/mosquitto/config
+      - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
       - ${DIR}/mosquitto/data:/mosquitto/data
       - ${DIR}/mosquitto/log:/mosquitto/log
     labels:
@@ -177,8 +208,8 @@ services:
 
     labels:
       - "traefik.http.routers.traefik.rule=Host(`tra.${DOMAIN}`)"
-      - "traefik.http.routers.traefik.middlewares=redirect@file"
       - "traefik.http.routers.traefik.entrypoints=web"
+      - "traefik.http.routers.traefik.middlewares=redirect@file"
       - "traefik.http.routers.traefik-secure.entrypoints=web-secure"
       - "traefik.http.routers.traefik-secure.rule=Host(`tra.${DOMAIN}`)"
       - "traefik.http.routers.traefik-secure.tls.certresolver=milvert"
diff --git a/mosquitto/mosquitto.conf b/mosquitto/mosquitto.conf
index 4a21b2b..374faa5 100644
--- a/mosquitto/mosquitto.conf
+++ b/mosquitto/mosquitto.conf
@@ -1,3 +1,9 @@
 persistence true
 persistence_location /mosquitto/data/
 log_dest file /mosquitto/log/mosquitto.log
+
+
+listener 1883
+
+listener 9001
+protocol websockets
diff --git a/static_config.yml b/static_config.yml
index b4775a6..3b407db 100644
--- a/static_config.yml
+++ b/static_config.yml
@@ -16,14 +16,51 @@ http:
       tls:
        certResolver: milvert
 
+    bitwarden-router:
+      rule: "Host(`bitwarden.milvert.com`)"
+      middlewares:
+        - redirect
+      service: bitwarden-service
+      entryPoints:
+         - web
+
+    bitwarden-router:
+      rule: "Host(`bitwarden.milvert.com`)"
+      service: bitwarden-service
+      entryPoints:
+         - web-secure
+      tls:
+       certResolver: milvert
+
+    redirect:
+      rule: "HostRegexp(`{host:.+}`)" # This catches all
+      middlewares:
+        - redirect
+      service: redirectfake-service
+      entryPoints:
+         - web
+      priority: 50
+
+
   services:
     lampa-service:
       loadBalancer:
         servers:
           - url: "http://10.0.0.3:8084"
 
+    bitwarden-service:
+      loadBalancer:
+        servers:
+          - url: "http://10.0.0.3:5178"
+
+    redirectfake-service:
+      loadBalancer:
+        servers:
+          - url: "http://fake"
+
   middlewares:
     redirect:
       redirectScheme:
+        permanent: true
         scheme: https