diff --git a/.github/workflows/build_devtool.yml b/.github/workflows/build_devtool.yml
index 832c7c99d..5837c29da 100644
--- a/.github/workflows/build_devtool.yml
+++ b/.github/workflows/build_devtool.yml
@@ -14,7 +14,7 @@ jobs:
         contents: write
         pull-requests: write
       timeout-minutes: 30
-      runs-on: ubuntu-22.04
+      runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
       steps:
         - uses: actions/checkout@v2
 
diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
index 1dc15c542..3cad8a964 100644
--- a/.github/workflows/general.yml
+++ b/.github/workflows/general.yml
@@ -15,7 +15,7 @@ jobs:
   run-checks:
     name: Run Checks
     permissions: {}
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
     steps:
       - name: Checkout
@@ -97,7 +97,7 @@ jobs:
   build-devtool:
     name: Build Devtools
     timeout-minutes: 30
-    runs-on: ubuntu-22.04
+    runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v2