diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml
index 45685fdc..9f2ae24a 100644
--- a/.github/workflows/cluster.yaml
+++ b/.github/workflows/cluster.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   client-tools:
     name: Stateless zot with shared reliable storage
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     # services:
     #   minio:
     #     image: minio/minio:RELEASE.2024-07-16T23-46-41Z
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3406446b..3c90a719 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml
index fa15c437..841e888f 100644
--- a/.github/workflows/gqlgen.yaml
+++ b/.github/workflows/gqlgen.yaml
@@ -19,7 +19,7 @@ permissions: read-all
 jobs:
   gqlgen:
     name: Check GQL generation
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index c8ff4c18..b22976c8 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -16,7 +16,7 @@ permissions: read-all
 jobs:
   dedupe:
     name: Dedupe/restore blobs
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -66,7 +66,7 @@ jobs:
 
   sync:
     name: Sync harness
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index da350e23..3646408d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   test-run-minimal:
     name: Running zot without extensions tests
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install go
@@ -93,7 +93,7 @@ jobs:
       - uses: ./.github/actions/teardown-localstack
   test-run-devmode:
     name: Running privileged tests on Linux
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
diff --git a/.github/workflows/web-scan.yaml b/.github/workflows/web-scan.yaml
index e48ceec1..d68b26b9 100644
--- a/.github/workflows/web-scan.yaml
+++ b/.github/workflows/web-scan.yaml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   zap_scan:
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     name: Scan ZOT using ZAP
     strategy:
       matrix: