diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index f673e0b90..35ebae0d5 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -15,6 +15,6 @@ jobs:
       - name: Run clang-format style check for C/C++/Protobuf programs.
         uses: jidicula/clang-format-action@v4.11.0
         with:
-          clang-format-version: '17'
+          clang-format-version: '18'
           check-path: ${{ matrix.path }}
           fallback-style: 'Google' # optional
\ No newline at end of file
diff --git a/.github/workflows/codecov-upload.yml b/.github/workflows/codecov-upload.yml
index a8dcaa093..89d72e8b9 100644
--- a/.github/workflows/codecov-upload.yml
+++ b/.github/workflows/codecov-upload.yml
@@ -5,10 +5,6 @@ on:
     branches:
       - main
       - develop
-  pull_request:
-    branches:
-      - main
-      - develop
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5d37cb16e..42adcefab 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,10 +17,6 @@ on:
       - main
       - develop
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches:
-      - main
-      - develop
   schedule:
     - cron: '26 7 * * 0'
   workflow_dispatch:
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 95c757645..7c490abb6 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -1,12 +1,6 @@
 name: Cppcheck
 
-on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
index ddc62b2ab..3e76377db 100644
--- a/.github/workflows/doxygen.yml
+++ b/.github/workflows/doxygen.yml
@@ -5,10 +5,6 @@ on:
     branches:
       - main
       - develop
-  pull_request:
-    branches:
-      - main
-      - develop
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/linux-clang.yml b/.github/workflows/linux-clang.yml
index 26b78285c..174f210fa 100644
--- a/.github/workflows/linux-clang.yml
+++ b/.github/workflows/linux-clang.yml
@@ -1,12 +1,6 @@
 name: Linux Clang
 
-on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/linux-gcc.yml b/.github/workflows/linux-gcc.yml
index 28076a060..55359bc28 100644
--- a/.github/workflows/linux-gcc.yml
+++ b/.github/workflows/linux-gcc.yml
@@ -1,12 +1,6 @@
 name: Linux GCC
 
-on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a87284c92..20d70332a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-latest-xlarge
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index a0fea53ba..f03f2ff41 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -6,9 +6,6 @@ on:
       - main
       - develop
   pull_request:
-    branches:
-      - main
-      - develop
   workflow_dispatch:
 
 concurrency: