diff --git a/.github/runs-on.yml b/.github/runs-on.yml
new file mode 100644
index 00000000..229c7c7c
--- /dev/null
+++ b/.github/runs-on.yml
@@ -0,0 +1,25 @@
+runners:
+  x86_64-runner:
+    cpu: [64, 72, 96, 128, 192]
+    ram: [128, 144, 192, 256, 384, 512]
+    family: ["c5d", "c5ad", "c6id", "m6id", "m5ad"]
+    spot: lowest-price
+    image: rhel_x86_64
+    ssh: false
+
+  arm64-runner:
+    cpu: [64, 72, 96, 128, 192]
+    ram: [128, 144, 192, 256, 384, 512]
+    family: ["c6gd", "c7gd", "c8gd", "g4dn", "m6gd", "m7gd", "r6gd", "r7gd"]
+    spot: lowest-price
+    image: rhel_arm64
+    ssh: false
+
+images:
+  rhel_x86_64:
+    ami: "ami-0fd3ac4abb734302a" # RHEL 10 x86_64, https://console.aws.amazon.com/ec2/home?region=us-east-1#ImageDetails:imageId=ami-0fd3ac4abb734302a
+    owner: 309956199498 # Official amazon owner id
+
+  rhel_arm64:
+    ami: "ami-0f8a907b7d1fbd468" # RHEL 10 arm64, https://console.aws.amazon.com/ec2/home?region=us-east-1#ImageDetails:imageId=ami-0f8a907b7d1fbd468
+    owner: 309956199498 # Official amazon owner id
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5371fa63..12ce9373 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,9 +121,7 @@ jobs:
   pushrpm:
     name: Push RPM
     if: github.triggering_actor == 'royaloughtness'
-    runs-on: ${{ inputs.arch == 'x86_64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
-    container: 
-      image: ${{ inputs.arch == 'x86_64' && 'fedora:42@sha256:89ed3ea10de7194c36524a290665960ddd4dae876a40beeadde2a9b4a0276681' || 'fedora:42@sha256:b6e8a32686d8bbe7a7e562d7215272a9b96b44c40e37f561ef807d112fde45d0' }}
+    runs-on: ${{ inputs.arch == 'x86_64' && 'x86_64-runner' || 'arm64-runner' }}
     needs: buildrpm
     outputs:
       hashes: ${{ steps.hash.outputs.hashes }}
diff --git a/README.md b/README.md
index 83dff520..2ac3c64a 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
 
 <h1 align="center">Trivalent</h1>
 
+[![Runners by - runs-on.com](https://img.shields.io/badge/Runners_by-runs--on.com-blue?style=for-the-badge)](https://runs-on.com/)
+
 A security-focused, Chromium-based browser for desktop Linux inspired by [Vanadium](https://github.com/GrapheneOS/Vanadium). Intended for use in [secureblue](https://github.com/secureblue/secureblue).
 
 ## Scope