diff --git a/.github/workflows/docs-trigger-build.yaml b/.github/workflows/docs-trigger-build.yaml
index 7160933..989ddae 100644
--- a/.github/workflows/docs-trigger-build.yaml
+++ b/.github/workflows/docs-trigger-build.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   trigger:
     name: Trigger
-    runs-on: [self-hosted, x64, linux, ephemeral, zon-image-latest]
+    runs-on: zon-ubuntu-general-dind
     if: contains(github.repository, 'ZeitOnline')
 
     steps:
@@ -21,4 +21,3 @@ jobs:
           repository: ZeitOnline/docs
           event-type: module-commit
           client-payload: '{"repo": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
diff --git a/.github/workflows/release-api-docs.yaml b/.github/workflows/release-api-docs.yaml
index f4c8ebb..ec93adc 100644
--- a/.github/workflows/release-api-docs.yaml
+++ b/.github/workflows/release-api-docs.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
   release:
     name: Release Swagger
-    runs-on: [self-hosted, x64, linux, ephemeral, zon-image-latest]
+    runs-on: zon-ubuntu-general-dind
     if: contains(github.repository, 'ZeitOnline')
     env:
       RELEASE_TAG: api-docs-latest
@@ -57,7 +57,7 @@ jobs:
 
   trigger:
     name: Trigger main docs build
-    runs-on: [self-hosted, x64, linux, ephemeral, zon-image-latest]
+    runs-on: zon-ubuntu-general-dind
     if: contains(github.repository, 'ZeitOnline')
     needs: release