diff --git a/.gitea/workflows/build-dev.yml b/.gitea/workflows/build-dev.yml
index 6b8bc7d..3d32920 100644
--- a/.gitea/workflows/build-dev.yml
+++ b/.gitea/workflows/build-dev.yml
@@ -10,7 +10,7 @@ env:
     extra-trusted-public-keys = radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0=
 jobs:
   build-dev-kiosk:
-    runs-on: build-server
+    runs-on: orion-lxc
     steps:
       - name: Clone Repository
         run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
@@ -37,7 +37,7 @@ jobs:
         run: rm -f "/home/user/radiantwave/${FILENAME}"
 
   build-dev-android:
-    runs-on: build-server
+    runs-on: orion-lxc
     steps:
       - name: Clone Repository
         run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
@@ -64,7 +64,7 @@ jobs:
         run: rm -f "/home/user/radiantwave/${FILENAME}"
 
   build-dev-commercial:
-    runs-on: build-server
+    runs-on: orion-lxc
     steps:
       - name: Clone Repository
         run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
diff --git a/.gitea/workflows/build-prod-android.yml b/.gitea/workflows/build-prod-android.yml
index 3770704..14cc75d 100644
--- a/.gitea/workflows/build-prod-android.yml
+++ b/.gitea/workflows/build-prod-android.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build-android:
-    runs-on: build-server
+    runs-on: orion-lxc
 
     steps:
       - name: Checkout
diff --git a/.gitea/workflows/build-prod-commercial.yml b/.gitea/workflows/build-prod-commercial.yml
index 59134d1..bc86dcb 100644
--- a/.gitea/workflows/build-prod-commercial.yml
+++ b/.gitea/workflows/build-prod-commercial.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build-commercial:
-    runs-on: build-server
+    runs-on: orion-lxc
 
     steps:
       - name: Checkout
diff --git a/.gitea/workflows/build-prod-kiosk.yml b/.gitea/workflows/build-prod-kiosk.yml
index e5e89ef..3fc2d3c 100644
--- a/.gitea/workflows/build-prod-kiosk.yml
+++ b/.gitea/workflows/build-prod-kiosk.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build-kiosk:
-    runs-on: build-server
+    runs-on: orion-lxc
 
     steps:
       - name: Checkout
diff --git a/.gitea/workflows/build-prod-rpi.yml b/.gitea/workflows/build-prod-rpi.yml
index 609ac5e..e8c2c83 100644
--- a/.gitea/workflows/build-prod-rpi.yml
+++ b/.gitea/workflows/build-prod-rpi.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   build-rpi:
-    runs-on: build-server
+    runs-on: orion-lxc
 
     steps:
       - name: Checkout