diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 738f668ab..91d239ff7 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   coverage:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     env:
       CODE_TYPE: stable
@@ -39,11 +39,12 @@ jobs:
       - name: 🔧 Install - Test Project
         run: npm install --workspace=extester-test
 
+      - name: ⚙️ Allow unprivileged user namespace (ubuntu)
+        run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+
       - name: 📊 Run Tests with Coverage enabled
         # 'set +e' and 'exit 0' - that means the workflow will not fail even the test failures are present. The failing tests are not directive for the code coverage reports itself
         run: |
-          # allow unprivileged user namespace
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
           set +e
           xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run test:coverage
           exit 0
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 162154658..4bc9b3429 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
 
   check:
     if: always()
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     name: 🚦 Status Check
     needs: [test]
     steps:
diff --git a/.github/workflows/template-main.yaml b/.github/workflows/template-main.yaml
index 468aa0a4c..8132c8836 100644
--- a/.github/workflows/template-main.yaml
+++ b/.github/workflows/template-main.yaml
@@ -52,14 +52,16 @@ jobs:
         run: npm install --workspace=extester-test
 
       - name: 🔍 Run Tests (macOS, windows)
-        if: matrix.os != 'ubuntu-24.04'
+        if: ${{ ! startsWith(matrix.os, 'ubuntu') }}
         run: npm test
 
+      - name: ⚙️ Allow unprivileged user namespace (ubuntu)
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+
       - name: 🔍 Run Tests (linux)
-        if: matrix.os == 'ubuntu-24.04'
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: |
-          # allow unprivileged user namespace
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0  
           xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm test
 
       - name: 💾 Upload Screenshots