diff --git a/docker-compose.yml b/docker-compose.yml
index c6e3e97..e5f2b64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,14 +10,6 @@ services:
       - 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"
@@ -38,11 +30,11 @@ services:
     container_name: zigbee2mqtt
     networks:
       - backend
-    image: koenkk/zigbee2mqtt:1.6.0
+    image: koenkk/zigbee2mqtt:1.8.0
     volumes:
       - ${DIR}/zigbee2matt:/app/data
     devices:
-      - /dev/ttyACM0:/dev/ttyACM0
+      - /dev/ttyACM-zigbee:/dev/ttyACM0
     restart: always
     environment:
       - TZ=Europe/Stockholm
@@ -89,12 +81,15 @@ services:
       - backend
     restart: always
     environment:
-      - USER_UID=1000
-      - USER_GID=1000
+      - USER_UID=1001
+      - USER_GID=1005
     volumes:
+      #- /var/lib/gitea:/data
       - ${DIR}/gitea:/data
+      - /home/git/.ssh:/data/git/.ssh
     ports:
       - "127.0.0.1:2222:22"
+      - "3000:3000"
     labels:
       - "traefik.enable=true"
       - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
@@ -110,7 +105,6 @@ services:
       - backend
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
       - "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"
@@ -185,7 +179,7 @@ services:
 
   reverse-proxy:
     # The official v2.0 Traefik docker image
-    image: traefik:v2.0.6
+    image: traefik:v2.1
     container_name: "traefik"
     networks:
       - backend
@@ -207,17 +201,15 @@ services:
       - 8.8.8.8
 
     labels:
+      - "traefik.enable=true"
       - "traefik.http.routers.traefik.rule=Host(`tra.${DOMAIN}`)"
-      - "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"
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.services.traefik-service.loadbalancer.server.port=8080"
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik-secure.middlewares=test-auth"
-      - "traefik.http.middlewares.test-auth.basicauth.users=simon:$$apr1$$o3vIe.DX$$3XExiBMe8rUo3HujDSYEo0"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      - "traefik.http.middlewares.traefik-auth.basicauth.users=simon:$$apr1$$o3vIe.DX$$3XExiBMe8rUo3HujDSYEo0"
 
 networks:
   frontend: