diff --git a/.github/workflows/epicmorg.advanced.images.yml b/.github/workflows/epicmorg.advanced.images.yml
index d5a4fe05b..6fbfe7961 100644
--- a/.github/workflows/epicmorg.advanced.images.yml
+++ b/.github/workflows/epicmorg.advanced.images.yml
@@ -9,7 +9,7 @@ jobs:
 
   build-images:
     name: EpicMorg Advanced Images
-    runs-on: self-hosted
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/epicmorg.base.images.teamcity.agents.yml b/.github/workflows/epicmorg.base.images.teamcity.agents.yml
index 4667c757d..b2444b50b 100644
--- a/.github/workflows/epicmorg.base.images.teamcity.agents.yml
+++ b/.github/workflows/epicmorg.base.images.teamcity.agents.yml
@@ -9,7 +9,7 @@ jobs:
 
   build-tca-main-images:
     name: Build EpicMorg TeamCity Agent Main Images
-    runs-on: self-hosted
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
 
   build-tca-other-images:
     name: Build EpicMorg TeamCity Agent Oter Images
-    runs-on: self-hosted
+    runs-on: ubuntu-24.04
     needs: build-tca-main-images
 
     steps: