diff --git a/ansible/roles/semaphore/tasks/main.yml b/ansible/roles/semaphore/tasks/main.yml
index d62fc9a..1002903 100644
--- a/ansible/roles/semaphore/tasks/main.yml
+++ b/ansible/roles/semaphore/tasks/main.yml
@@ -32,6 +32,15 @@
 - name: Legacy deployment with PostgreSQL
   when: semaphore_use_postgres | default(false)
   block:
+    - name: Remove existing containers if present
+      ansible.builtin.command:
+        cmd: "podman rm -f {{ item }}"
+      become: true
+      failed_when: false
+      loop:
+        - "{{ semaphore_postgres_container_name }}"
+        - "{{ semaphore_container_name }}"
+
     - name: Create dedicated Podman network for Semaphore + PostgreSQL
       ansible.builtin.command:
         cmd: "podman network create semaphore-net"