diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d2483246b..fdf9007cf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, type-cx42]
     steps:
       - name: Git describe
         id: ghd
@@ -78,7 +78,7 @@ jobs:
           path: ./frontend/dist/**/*
 
   binaries:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, type-cx42]
     needs:
       - frontend
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c31c0c38..4663723de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -163,7 +163,7 @@ jobs:
           ./vikunja migrate
   
   test-api:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, type-cx32, image-x86-app-docker-ce]
     needs:
       - mage
     strategy:
@@ -313,7 +313,7 @@ jobs:
           pnpm test:unit
   
   test-frontend-e2e:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, type-cx32, image-x86-app-docker-ce]
     needs:
       - frontend-dependencies
       - api-build