diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml
index 6c930c8..8b68ebe 100644
--- a/.gitea/workflows/cron.yaml
+++ b/.gitea/workflows/cron.yaml
@@ -37,11 +37,11 @@ jobs:
 
       - name: Cleanup old Qdrant container
         run: |
-          docker rm -f mcp-maildir-ci-qdrant 2>/dev/null || true
+          docker rm -f qdrant-${{ github.run_id }} 2>/dev/null || true
 
       - name: Start Qdrant
         run: |
-          docker run -d --name mcp-maildir-ci-qdrant \
+          docker run -d --name qdrant-${{ github.run_id }} \
             --network "container:$(hostname)" \
             docker.io/qdrant/qdrant:latest
 
@@ -68,7 +68,7 @@ jobs:
 
       - name: Cleanup Qdrant
         if: always()
-        run: docker rm -f mcp-maildir-ci-qdrant || true
+        run: docker rm -f qdrant-${{ github.run_id }} || true
 
   build-push:
     needs: [test, integration-test]
diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml
index bfe90eb..8972a8e 100644
--- a/.gitea/workflows/docker-build.yaml
+++ b/.gitea/workflows/docker-build.yaml
@@ -29,8 +29,8 @@ jobs:
 
       - name: Start Qdrant
         run: |
-          docker rm -f qdrant 2>/dev/null || true
-          docker run -d --name qdrant \
+          docker rm -f qdrant-${{ github.run_id }} 2>/dev/null || true
+          docker run -d --name qdrant-${{ github.run_id }} \
             --network "container:$(hostname)" \
             docker.io/qdrant/qdrant:latest
 
@@ -56,7 +56,7 @@ jobs:
 
       - name: Cleanup Qdrant
         if: always()
-        run: docker rm -f qdrant 2>/dev/null || true
+        run: docker rm -f qdrant-${{ github.run_id }} 2>/dev/null || true
 
   build:
     runs-on: ubuntu-latest
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index db628e9..a1ad96e 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -37,11 +37,11 @@ jobs:
 
       - name: Cleanup old Qdrant container
         run: |
-          docker rm -f mcp-maildir-ci-qdrant 2>/dev/null || true
+          docker rm -f qdrant-${{ github.run_id }} 2>/dev/null || true
 
       - name: Start Qdrant
         run: |
-          docker run -d --name mcp-maildir-ci-qdrant \
+          docker run -d --name qdrant-${{ github.run_id }} \
             --network "container:$(hostname)" \
             docker.io/qdrant/qdrant:latest
 
@@ -68,7 +68,7 @@ jobs:
 
       - name: Cleanup Qdrant
         if: always()
-        run: docker rm -f mcp-maildir-ci-qdrant || true
+        run: docker rm -f qdrant-${{ github.run_id }} || true
 
   build:
     needs: [test, integration-test]
diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml
index 6458f7b..ceb1674 100644
--- a/.gitea/workflows/tag.yaml
+++ b/.gitea/workflows/tag.yaml
@@ -37,11 +37,11 @@ jobs:
 
       - name: Cleanup old Qdrant container
         run: |
-          docker rm -f mcp-maildir-ci-qdrant 2>/dev/null || true
+          docker rm -f qdrant-${{ github.run_id }} 2>/dev/null || true
 
       - name: Start Qdrant
         run: |
-          docker run -d --name mcp-maildir-ci-qdrant \
+          docker run -d --name qdrant-${{ github.run_id }} \
             --network "container:$(hostname)" \
             docker.io/qdrant/qdrant:latest
 
@@ -68,7 +68,7 @@ jobs:
 
       - name: Cleanup Qdrant
         if: always()
-        run: docker rm -f mcp-maildir-ci-qdrant || true
+        run: docker rm -f qdrant-${{ github.run_id }} || true
 
   build-push:
     needs: [test, integration-test]