diff --git a/.github/workflows/bouncer.yml b/.github/workflows/bouncer.yml
index 75ae90f..5785a91 100644
--- a/.github/workflows/bouncer.yml
+++ b/.github/workflows/bouncer.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   bouncer-build:
     name: "Bake Bouncer Container"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 81b933c..f4a6b62 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   wordpress-build:
     name: "Bake Laravel Container"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index aae2707..69bd787 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   lint:
     name: Lint Docker Files
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
index cac1fa2..0cdeb34 100644
--- a/.github/workflows/mariadb.yml
+++ b/.github/workflows/mariadb.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   mariadb-build:
     name: "MariaDB with Healthchecks"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     needs: [ lint ]
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/marshall.yml b/.github/workflows/marshall.yml
index b9f6313..b7c07fa 100644
--- a/.github/workflows/marshall.yml
+++ b/.github/workflows/marshall.yml
@@ -18,7 +18,7 @@ jobs:
 
   build:
     name: "Build Marshall"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/mqtt.yml b/.github/workflows/mqtt.yml
index c375038..0bd9592 100644
--- a/.github/workflows/mqtt.yml
+++ b/.github/workflows/mqtt.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   MQTT-build:
     name: "MQTT"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 04d2663..707ec9d 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   node-build-flavours:
     name: "Build Node Flavours"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/octoprint.yml b/.github/workflows/octoprint.yml
index 284eb37..8a49845 100644
--- a/.github/workflows/octoprint.yml
+++ b/.github/workflows/octoprint.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   octoprint-build:
     name: "Bake Octoprint"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
@@ -31,7 +31,7 @@ jobs:
           tags: matthewbaggett/octoprint:latest
   octoprint-mjpg-build:
     name: "Bake Octoprint for yuvu cameras"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/php-core.yml b/.github/workflows/php-core.yml
index 29906f2..7eca504 100644
--- a/.github/workflows/php-core.yml
+++ b/.github/workflows/php-core.yml
@@ -20,7 +20,7 @@ jobs:
 
   php-build-core:
     name: "Build PHP Core"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/php-flavours.yml b/.github/workflows/php-flavours.yml
index e8c98b3..f747ba8 100644
--- a/.github/workflows/php-flavours.yml
+++ b/.github/workflows/php-flavours.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   php-build-flavours:
     name: "Build PHP Flavours"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/php-vanity-tags.yml b/.github/workflows/php-vanity-tags.yml
index b513584..5385aea 100644
--- a/.github/workflows/php-vanity-tags.yml
+++ b/.github/workflows/php-vanity-tags.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   php-vanity-tags:
     name: Vanity Tags
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     env:
       latest-stable-version: "7.4"
     strategy:
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
index ee09db2..7ffef2c 100644
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   redis-build:
     name: "Redis with Healthchecks"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/swarm-monitor.yml b/.github/workflows/swarm-monitor.yml
index d4f36eb..c29fb1f 100644
--- a/.github/workflows/swarm-monitor.yml
+++ b/.github/workflows/swarm-monitor.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Git Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/wordpress.yml b/.github/workflows/wordpress.yml
index 6a49224..a42fc57 100644
--- a/.github/workflows/wordpress.yml
+++ b/.github/workflows/wordpress.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   wordpress-build:
     name: "Bake Wordpress Container"
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v1
       - uses: docker/setup-qemu-action@v1