diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml
index 9e7850ab..97b6c4d1 100644
--- a/.gitea/workflows/deploy_dev.yaml
+++ b/.gitea/workflows/deploy_dev.yaml
@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node
diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml
index d205e167..1a4fb6dd 100644
--- a/.gitea/workflows/deploy_prod.yaml
+++ b/.gitea/workflows/deploy_prod.yaml
@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node
diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml
index 7eabe8cd..f8bbd17a 100644
--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node
diff --git a/bot/docker b/bot/docker
index 8063944d..9c0dc595 160000
--- a/bot/docker
+++ b/bot/docker
@@ -1 +1 @@
-Subproject commit 8063944d871d88a1400e45d3fdac29ee69485eb5
+Subproject commit 9c0dc595348f9ccd58409cc21171456d9ba85758
diff --git a/bot/src/bot_core/service/data_integrity_service.py b/bot/src/bot_core/service/data_integrity_service.py
index cb3c0f6f..83f53551 100644
--- a/bot/src/bot_core/service/data_integrity_service.py
+++ b/bot/src/bot_core/service/data_integrity_service.py
@@ -398,6 +398,9 @@ class DataIntegrityService:
                 if user is None:
                     continue
 
+                for join in self._user_joins.get_user_joined_servers_by_user_id(user.id):
+                    self._user_joins.delete_user_joined_server(join)
+
                 self._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id)
                 self._users.delete_user(user)
                 self._db_context.save_changes()