diff --git a/tasks/syncthing.yml b/tasks/syncthing.yml
index 8223bf3..321d198 100644
--- a/tasks/syncthing.yml
+++ b/tasks/syncthing.yml
@@ -57,10 +57,22 @@
     group: sonny
     mode: '0755'
 
-- name: Start container
+- name: Stop current containers
+  community.docker.docker_compose_v2:
+    project_src: '{{ syncthing_app_dir }}'
+    state: stopped
+
+- name: Pull missing image
+  community.docker.docker_compose_v2:
+    project_src: '{{ syncthing_app_dir }}'
+    pull: missing
+
+- name: Remove dangling containers
   community.docker.docker_compose_v2:
     project_src: '{{ syncthing_app_dir }}'
     remove_orphans: true
-    state: restarted
-    pull: always
-    wait: true
+
+- name: Start container
+  community.docker.docker_compose_v2:
+    project_src: '{{ syncthing_app_dir }}'
+    state: present