diff --git a/containers-update.yml b/containers-update.yml
index ef88bc0..b5ef442 100644
--- a/containers-update.yml
+++ b/containers-update.yml
@@ -1,50 +1,70 @@
-- hosts: containers
+- hosts: stateful
   tasks:
+  
+  - name: Upgrade TeamMapper
+    shell:
+      cmd: docker compose --file teammapper-compose.yml pull && docker compose --file teammapper-compose.yml up --force-recreate --build -d
+      chdir: /home/pierre
       
   - name: Upgrade Vaultwarden
     shell:
-      cmd: docker compose --file vaultwarden-compose.yml pull && docker compose --file vaultwarden-compose.yml up -d
+      cmd: docker compose --file vaultwarden-compose.yml pull && docker compose --file vaultwarden-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Traefik
     shell:
-      cmd: docker compose --file traefik-compose.yml pull && docker compose --file traefik-compose.yml up -d
+      cmd: docker compose --file traefik-compose.yml pull && docker compose --file traefik-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Pi-hole
     shell:
-      cmd: docker compose --file pihole-compose.yml pull && docker compose --file pihole-compose.yml up -d
+      cmd: docker compose --file pihole-compose.yml pull && docker compose --file pihole-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Forgejo
     shell:
-      cmd: docker compose --file forgejo-compose.yml pull && docker compose --file forgejo-compose.yml up -d
+      cmd: docker compose --file forgejo-compose.yml pull && docker compose --file forgejo-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Conduit
     shell:
-      cmd: docker compose --file conduit-compose.yml pull && docker compose --file conduit-compose.yml up -d
-      chdir: /home/pierre
-      
-- hosts: statelessops
-  tasks:
-      
-  - name: Upgrade Woodpecker CI
-    shell:
-      cmd: docker compose --file woodpecker-compose.yml pull && docker compose --file woodpecker-compose.yml up -d
+      cmd: docker compose --file conduit-compose.yml pull && docker compose --file conduit-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Nocodb
     shell:
-      cmd: docker compose --file nocodb-compose.yml pull && docker compose --file nocodb-compose.yml up -d
+      cmd: docker compose --file nocodb-compose.yml pull && docker compose --file nocodb-compose.yml up --force-recreate --build -d
+      chdir: /home/pierre
+      
+  - name: Prune docker images
+    shell:
+      cmd: docker image prune -f
+      chdir: /home/pierre
+      
+- hosts: stateless
+  tasks:
+      
+  - name: Upgrade Woodpecker CI
+    shell:
+      cmd: docker compose --file woodpecker-compose.yml pull && docker compose --file woodpecker-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade Leantime
     shell:
-      cmd: docker compose --file leantime-compose.yml pull && docker compose --file leantime-compose.yml up -d
+      cmd: docker compose --file leantime-compose.yml pull && docker compose --file leantime-compose.yml up --force-recreate --build -d
       chdir: /home/pierre
       
   - name: Upgrade DLNextcloud
     shell:
-      cmd: docker compose --file dlnextcloud-compose.yml down && docker compose --file dlnextcloud-compose.yml build && docker compose --file dlnextcloud-compose.yml up -d
+      cmd: docker compose --file dlnextcloud-compose.yml down && docker compose --file dlnextcloud-compose.yml build && docker compose --file dlnextcloud-compose.yml up --force-recreate --build -d
+      chdir: /home/pierre
+      
+  - name: Upgrade n8n
+    shell:
+      cmd: docker compose --file n8n-compose.yml pull && docker compose --file n8n-compose.yml up --force-recreate --build -d
+      chdir: /home/pierre
+      
+  - name: Prune docker images
+    shell:
+      cmd: docker image prune -f
       chdir: /home/pierre