diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 4525233..96e7ba1 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -39,10 +39,19 @@ jobs:
 
       - name: Run new container
         run: |
+          PORT=5005
+          CONTAINER_ID=$(docker ps --format '{{.ID}} {{.Ports}}' | grep ":$PORT->" | awk '{print $1}')
+
+          if [ -n "$CONTAINER_ID" ]; then
+            echo "Stopping container using port $PORT..."
+            docker stop "$CONTAINER_ID"
+            docker rm "$CONTAINER_ID"
+          fi
+
           docker run -d \
             --name olaper \
             --restart always \
-            -p 5005:5005 \
+            -p ${PORT}:5005 \
             -e SECRET_KEY=${{ secrets.SECRET_KEY }} \
             -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \
             -v olaper_data:/opt/olaper/data \
diff --git a/.gitea/workflows/testing.yml b/.gitea/workflows/testing.yml
index 0ac62d6..238eecd 100644
--- a/.gitea/workflows/testing.yml
+++ b/.gitea/workflows/testing.yml
@@ -39,6 +39,7 @@ jobs:
           docker run -d \
             --name olaper_test \
             -p 5050:5005 \
+            -v /home/master/olaper-debug/data:/opt/olaper/data \
             -e SECRET_KEY=${{ secrets.SECRET_KEY }} \
             -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \
             olaper:test