diff --git a/ansible/roles/semaphore/tasks/main.yml b/ansible/roles/semaphore/tasks/main.yml
index 54262b5..343c91c 100644
--- a/ansible/roles/semaphore/tasks/main.yml
+++ b/ansible/roles/semaphore/tasks/main.yml
@@ -32,6 +32,21 @@
 - name: Legacy deployment with PostgreSQL
   when: semaphore_use_postgres | default(false)
   block:
+    - name: Aggressive storage cleanup (when semaphore_force_storage_cleanup=true)
+      when: semaphore_force_storage_cleanup | default(false)
+      block:
+        - name: Force remove all containers
+          ansible.builtin.command:
+            cmd: "podman rm -af"
+          become: true
+          failed_when: false
+
+        - name: Prune unused images, volumes and networks
+          ansible.builtin.command:
+            cmd: "podman system prune -f --volumes"
+          become: true
+          failed_when: false
+
     - name: Remove existing containers if present (force + storage cleanup)
       ansible.builtin.command:
         cmd: "podman rm -f --storage {{ item }}"