diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c66abdc7d..7fb8298f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -123,7 +123,7 @@ jobs:
       - setup-tags
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "private-babylon-ng-database-migrations"
@@ -166,7 +166,7 @@ jobs:
       - setup-tags
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "private-babylon-ng-data-aggregator"
@@ -209,7 +209,7 @@ jobs:
       - setup-tags
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "private-babylon-ng-gateway-api"
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index f86132384..9cc328d0a 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -102,7 +102,7 @@ jobs:
       packages: write
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "babylon-ng-database-migrations"
@@ -160,7 +160,7 @@ jobs:
       packages: write
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "babylon-ng-data-aggregator"
@@ -218,7 +218,7 @@ jobs:
       packages: write
     uses: radixdlt/public-iac-resuable-artifacts/.github/workflows/docker-build.yml@main
     with:
-      runs_on: babylon-gateway-arm
+      runs_on: selfhosted-ubuntu-22.04-arm
       image_registry: "docker.io"
       image_organization: "radixdlt"
       image_name: "babylon-ng-gateway-api"