diff --git a/.github/workflows/broker.yml b/.github/workflows/broker.yml
index 542cc82386..c3571f72c2 100644
--- a/.github/workflows/broker.yml
+++ b/.github/workflows/broker.yml
@@ -92,7 +92,7 @@ jobs:
   docker:
     needs: [test-unit, test-integration]
     name: Build, test, and publish Docker images
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     # run job only for main and tags
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
diff --git a/.github/workflows/selfhosted-runner-test.yaml b/.github/workflows/selfhosted-runner-test.yaml
deleted file mode 100644
index eeb7094176..0000000000
--- a/.github/workflows/selfhosted-runner-test.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Build with self-hosted runner
-on:
-  workflow_dispatch:
-
-defaults:
-  run:
-    working-directory: packages/broker
-
-jobs:
-  build:
-    name: Self-Hosted Build
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v2.3.4
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.1.5
-        with:
-          node-version: 16.x
-      - name: npm ci
-        working-directory: './'
-        run: |
-          npm ci
-          npx lerna bootstrap --scope streamr-broker --include-dependencies
-      - run: npm run eslint
-      - run: npm run test-unit