diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index d3cf12b..1d422a2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -99,7 +99,11 @@ jobs:
             docker network inspect crew-app-net >/dev/null 2>&1 || \
               docker network create crew-app-net
 
-            echo "🚀 Starting containers (env vars from .env file)"
+            echo "� Stopping and removing existing containers"
+            docker compose down || true
+            docker rm -f merchbay_admin_app || true
+
+            echo "�🚀 Starting containers (env vars from .env file)"
             docker compose up -d
 
             echo "⏳ Waiting for app container"