diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index 16a13e5ef92..2a95b3f9fe5 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -1,10 +1,15 @@
 name: Lint GitHub Actions workflows
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   actionlint:
     runs-on: ubuntu-latest
     name: Check all workflow files
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
       - name: Download actionlint
diff --git a/.github/workflows/annotate_cpp.yml b/.github/workflows/annotate_cpp.yml
index b4593b441ac..4536ed99ef0 100644
--- a/.github/workflows/annotate_cpp.yml
+++ b/.github/workflows/annotate_cpp.yml
@@ -2,6 +2,10 @@ name: Annotate Cpp
 
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   annotate-cpp:
     strategy:
@@ -9,6 +13,7 @@ jobs:
         os: ['ubuntu-latest']
 
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 71e6448f66b..095d56494ed 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -14,7 +14,7 @@ jobs:
   benchmark:
     name: Run pytest-benchmark benchmark example
     runs-on: ubuntu-latest
-
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml
index e2d800739b0..34ca6e5b261 100644
--- a/.github/workflows/build-wheels-linux.yml
+++ b/.github/workflows/build-wheels-linux.yml
@@ -3,8 +3,8 @@ on:
     inputs:
       python-version:
         type: string
-jobs:
 
+jobs:
   build-wheels:
     timeout-minutes: 30
     strategy:
diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index e8a2dcd22a8..d818b8c9c0d 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -5,8 +5,8 @@ on:
         type: string
       os:
         type: string
-jobs:
 
+jobs:
   build-wheels:
     timeout-minutes: 45
     strategy:
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9066dd10d78..6c1147152ac 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -12,6 +12,10 @@ env:
   ERT_SHOW_BACKTRACE: 1
   ECL_SKIP_SIGNAL: 1
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   build-test-cmake:
     name: Run C++ tests and coverage
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 4f1e6abe025..b61f5e777ec 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -8,6 +8,10 @@ on:
    tags: "*"
  pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   python-test-coverage:
     name: Python Coverage
diff --git a/.github/workflows/dark_storage_benchmark.yml b/.github/workflows/dark_storage_benchmark.yml
index df8ec0e1705..394f49ce95c 100644
--- a/.github/workflows/dark_storage_benchmark.yml
+++ b/.github/workflows/dark_storage_benchmark.yml
@@ -12,6 +12,10 @@ permissions:
     # contents permission to update benchmark contents in gh-pages branch
     contents: write
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   benchmark:
     name: Run pytest-benchmark dark storage
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 3227fea76d9..56366487dba 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -8,9 +8,13 @@ on:
    tags: "*"
  pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   python-doctest:
-    name:
+    name: Set up Python ${{ matrix.python-version }}
     timeout-minutes: 40
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/run_ert_test_data_setups.yml b/.github/workflows/run_ert_test_data_setups.yml
index 991c9c0f97e..269aac9e982 100644
--- a/.github/workflows/run_ert_test_data_setups.yml
+++ b/.github/workflows/run_ert_test_data_setups.yml
@@ -8,8 +8,8 @@ on:
  pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   ERT_SHOW_BACKTRACE: 1
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index e8de9c0b685..b14e0b70670 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -7,6 +7,10 @@ on:
      - 'version-**'
  pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   check-style:
     timeout-minutes: 15
diff --git a/.github/workflows/test_ert.yml b/.github/workflows/test_ert.yml
index 67f62d9aa5c..2347164bb15 100644
--- a/.github/workflows/test_ert.yml
+++ b/.github/workflows/test_ert.yml
@@ -7,12 +7,12 @@ on:
         type: string
       test-type:
         type: string
-jobs:
 
+jobs:
   tests-ert:
     name: Run ert tests
     runs-on: ${{ inputs.os }}
-
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/.github/workflows/test_ert_with_slurm.yml b/.github/workflows/test_ert_with_slurm.yml
index c5087ff1e2c..9ee3b6c8eb3 100644
--- a/.github/workflows/test_ert_with_slurm.yml
+++ b/.github/workflows/test_ert_with_slurm.yml
@@ -5,6 +5,7 @@ on:
         type: string
       python-version:
         type: string
+
 jobs:
   test-poly-on-slurm:
     name: Run ert tests
diff --git a/.github/workflows/test_semeio.yml b/.github/workflows/test_semeio.yml
index ad7b835239f..44771e0f9d0 100644
--- a/.github/workflows/test_semeio.yml
+++ b/.github/workflows/test_semeio.yml
@@ -7,6 +7,10 @@ name: Test Semeio
 
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   test-semeio:
     name: Test Semeio
diff --git a/.github/workflows/typing.yml b/.github/workflows/typing.yml
index f8c2866dc35..bdc67bc510f 100644
--- a/.github/workflows/typing.yml
+++ b/.github/workflows/typing.yml
@@ -7,6 +7,10 @@ on:
      - 'version-**'
  pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   type-checking:
     runs-on: ubuntu-latest