diff --git a/ansible/roles/semaphore/tasks/main.yml b/ansible/roles/semaphore/tasks/main.yml
index 1002903..54262b5 100644
--- a/ansible/roles/semaphore/tasks/main.yml
+++ b/ansible/roles/semaphore/tasks/main.yml
@@ -32,9 +32,9 @@
 - name: Legacy deployment with PostgreSQL
   when: semaphore_use_postgres | default(false)
   block:
-    - name: Remove existing containers if present
+    - name: Remove existing containers if present (force + storage cleanup)
       ansible.builtin.command:
-        cmd: "podman rm -f {{ item }}"
+        cmd: "podman rm -f --storage {{ item }}"
       become: true
       failed_when: false
       loop:
@@ -49,13 +49,12 @@
       changed_when: "'already exists' not in net_result.stderr"
       failed_when: false
 
-    - name: Create required Podman volumes
+    - name: Ensure required Podman volumes exist (reuse if present)
       ansible.builtin.command:
-        cmd: "podman volume create {{ item }}"
+        cmd: "podman volume exists {{ item }} || podman volume create {{ item }}"
       become: true
-      register: vol_result
-      changed_when: vol_result.stdout | length > 0
       failed_when: false
+      changed_when: false
       loop:
         - "{{ semaphore_postgres_volume }}"
         - "{{ semaphore_data_volume }}"