diff --git a/bxl-swarm/mediaserver.stack.yaml b/bxl-swarm/mediaserver.stack.yaml
new file mode 100644
index 0000000..6dac66f
--- /dev/null
+++ b/bxl-swarm/mediaserver.stack.yaml
@@ -0,0 +1,32 @@
+version: '3.7'
+services:
+  jellyfin:
+    image: linuxserver/jellyfin:latest
+    volumes:
+      - /mnt/nfs/jellyfin:/config
+      - /mnt/movies/series:/data/tvshows
+      - /mnt/movies/movies:/data/movies
+      - /mnt/movies/musics:/data/musics
+    environment:
+      - TZ=Europe/Paris
+    networks:
+    - external
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+        max_attempts: 3
+      placement:
+        constraints: [node.labels.HWA == true]
+      labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.bhasher.com`)"
+      - "traefik.http.routers.jellyfin.entrypoints=internalsecure,externalsecure"
+      - "traefik.http.services.jellyfin.loadbalancer.server.port=8096"
+      - "traefik.http.routers.jellyfin.tls=true"
+      - "traefik.http.routers.jellyfin.tls.certresolver=http"
+
+networks:
+  external:
+    external: true
diff --git a/bxl-swarm/smarthome.stack.yaml b/bxl-swarm/smarthome.stack.yaml
index 83b8a5b..126e706 100644
--- a/bxl-swarm/smarthome.stack.yaml
+++ b/bxl-swarm/smarthome.stack.yaml
@@ -7,8 +7,6 @@ services:
     - /etc/localtime:/etc/localtime:ro
     networks:
     - external
-    ports:
-    - 5683:5683
     deploy:
       mode: replicated
       replicas: 1
@@ -23,6 +21,23 @@ services:
       - "traefik.http.routers.hass.tls=true"
       - "traefik.http.routers.hass.tls.certresolver=http"
 
+  mosquitto:
+    image: eclipse-mosquitto:latest
+    volumes:
+    - /mnt/nfs/mosquitto/config:/mosquitto/config
+    - /mnt/nfs/mosquitto/data:/mosquitto/data
+    ports:
+    - 1883:1883
+    - 9001:9001
+    networks:
+    - external
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: any
+        max_attempts: 3
+
 networks:
   external:
     external: true