diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 36fca631..ed10b4da 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -68,7 +68,7 @@ jobs:
 
   edge-agent:
     name: Edge Agent (required)
-    runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -376,7 +376,7 @@ jobs:
 
   release-manager-gate:
     name: Release Manager gate
-    runs-on: [self-hosted, Linux, X64, pleno, backend]
+    runs-on: ubuntu-24.04
     needs: [required-ci]
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && needs.required-ci.result == 'success' }}