diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aba5a64062..d2ea139566 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,10 +25,7 @@ on:
 jobs:
   builds:
     timeout-minutes: 60
-    strategy:
-      matrix:
-        platform: [macos-latest, buildjet-4vcpu-ubuntu-2204]
-    runs-on: ${{ matrix.platform }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
@@ -63,7 +60,7 @@ jobs:
 
   publish-code-coverage:
     timeout-minutes: 60
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
@@ -111,7 +108,7 @@ jobs:
           verbose: true
 
   docker-build-n-push:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
     steps:
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 7377a374a5..740f63233e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -14,7 +14,7 @@ name: checks
 
 jobs:
   linting:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml
index abce564722..9deca1c454 100644
--- a/.github/workflows/copyright.yml
+++ b/.github/workflows/copyright.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   copyright-check:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/devnet.yml b/.github/workflows/devnet.yml
index 8c84cf5509..c152f20923 100644
--- a/.github/workflows/devnet.yml
+++ b/.github/workflows/devnet.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   update:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/docker-grandpa.yml b/.github/workflows/docker-grandpa.yml
index 27975e9bf8..e562e55053 100644
--- a/.github/workflows/docker-grandpa.yml
+++ b/.github/workflows/docker-grandpa.yml
@@ -18,7 +18,7 @@ name: docker-grandpa
 
 jobs:
   docker-grandpa-tests:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
     steps:
diff --git a/.github/workflows/docker-js.yml b/.github/workflows/docker-js.yml
index c3761430b0..6db1ef032f 100644
--- a/.github/workflows/docker-js.yml
+++ b/.github/workflows/docker-js.yml
@@ -18,7 +18,7 @@ name: docker-js
 
 jobs:
   docker-polkadotjs-tests:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
     steps:
diff --git a/.github/workflows/docker-rpc.yml b/.github/workflows/docker-rpc.yml
index 2cab70d873..7b48dd22b9 100644
--- a/.github/workflows/docker-rpc.yml
+++ b/.github/workflows/docker-rpc.yml
@@ -18,7 +18,7 @@ name: docker-rpc
 
 jobs:
   docker-rpc-tests:
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
     steps:
diff --git a/.github/workflows/docker-stress.yml b/.github/workflows/docker-stress.yml
index 3f3ec7e3be..88a6e5dcd7 100644
--- a/.github/workflows/docker-stress.yml
+++ b/.github/workflows/docker-stress.yml
@@ -18,7 +18,7 @@ name: docker-stress
 
 jobs:
   docker-stress-tests:
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: "1"
     steps:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 7db63832b8..c0d848f2dd 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build:
     name: Deploy docs
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout main
         uses: actions/checkout@v4
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 8b42a1c327..2d2edb41fc 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -5,7 +5,7 @@ name: fuzz
 jobs:
   fuzz:
     timeout-minutes: 30
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index de2b3403b4..e4043a98d2 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -36,7 +36,7 @@ jobs:
             github.com/ChainSafe/gossamer/lib/babe,
             github.com/ChainSafe/gossamer/lib/grandpa,
           ]
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/mocks.yml b/.github/workflows/mocks.yml
index 72de79b5c9..2db4dc6d13 100644
--- a/.github/workflows/mocks.yml
+++ b/.github/workflows/mocks.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   mocks-check:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4421ee707d..4e199844fc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
   release:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     name: Release
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 1f5a2eb87f..d0c18241b4 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -19,8 +19,8 @@ name: unit-tests
 
 jobs:
   unit-tests:
-    timeout-minutes: 15
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.12.1
@@ -78,7 +78,7 @@ jobs:
           cd ..
 
       - name: Run unit tests
-        run: CI=buildjet go test -coverprofile=coverage.out -covermode=atomic -timeout=15m ./...
+        run: CI=buildjet go test -coverprofile=coverage.out -covermode=atomic -timeout=30m ./...
 
       - name: Trie memory test
         run: |