diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 124febc4872..2e84c662d05 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -120,34 +120,6 @@ jobs:
           dotnet: ${{ needs.check_dockerfiles.outputs.dotnet }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-  lint_dockerfile:
-    needs: [check_dockerfiles]
-    if: ${{ needs.check_dockerfiles.outputs.dockerfiles }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.check_dockerfiles.outputs.matrix) }}
-    name: Lint Dockerfile${{ matrix.tag }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Hadolint
-        id: hadolint
-        uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: ${{ matrix.dockerfile }}
-          ignore: DL3008,DL3013,DL3016,DL3018,DL3028,DL3059
-          output-file: ./hadolint.log
-          verbose: true
-
-      - name: Log
-        if: failure()
-        run: |
-          echo "Hadolint outcome: ${{ steps.hadolint.outcome }}" >> $GITHUB_STEP_SUMMARY
-          cat "./hadolint.log" >> $GITHUB_STEP_SUMMARY
-
   docker:
     needs: [check_dockerfiles, setup_release]
     if: ${{ needs.check_dockerfiles.outputs.dockerfiles }}
diff --git a/.github/workflows/common-lint.yml b/.github/workflows/common-lint.yml
new file mode 100644
index 00000000000..4a62b245ed2
--- /dev/null
+++ b/.github/workflows/common-lint.yml
@@ -0,0 +1,245 @@
+---
+# This action is centrally managed in https://github.com/<organization>/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
+# the above-mentioned repo.
+
+# Common linting.
+
+name: common lint
+
+on:
+  pull_request:
+    branches: [master]
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: Common Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade \
+            pip \
+            setuptools \
+            wheel \
+            cmakelang \
+            flake8 \
+            nb-clean \
+            nbqa[toolchain]
+
+      - name: C++ - find files
+        id: cpp_files
+        run: |
+          # find files
+          found_files=$(find . -type f \
+            -iname "*.c" -o \
+            -iname "*.cpp" -o \
+            -iname "*.h" -o \
+            -iname "*.hpp" -o \
+            -iname "*.m" -o \
+            -iname "*.mm" \
+          )
+          ignore_files=$(find . -type f -iname ".clang-format-ignore")
+
+          # Loop through each C++ file
+          for file in $found_files; do
+            for ignore_file in $ignore_files; do
+              ignore_directory=$(dirname "$ignore_file")
+              # if directory of ignore_file is beginning of file
+              if [[ "$file" == "$ignore_directory"* ]]; then
+                echo "ignoring file: ${file}"
+                found_files="${found_files//${file}/}"
+                break 1
+              fi
+            done
+          done
+
+          # remove empty lines
+          found_files=$(echo "$found_files" | sed '/^\s*$/d')
+
+          echo "found cpp files: ${found_files}"
+
+          # do not quote to keep this as a single line
+          echo found_files=${found_files} >> $GITHUB_OUTPUT
+
+      - name: C++ - Clang format lint
+        if: always() && steps.cpp_files.outputs.found_files
+        uses: DoozyX/clang-format-lint-action@v0.18
+        with:
+          source: ${{ steps.cpp_files.outputs.found_files }}
+          extensions: 'c,cpp,h,hpp,m,mm'
+          style: file
+          inplace: false
+
+      - name: CMake - find files
+        id: cmake_files
+        if: always()
+        run: |
+          # find files
+          found_files=$(find . -type f -iname "CMakeLists.txt" -o -iname "*.cmake")
+          ignore_files=$(find . -type f -iname ".cmake-lint-ignore")
+
+          # Loop through each C++ file
+          for file in $found_files; do
+            for ignore_file in $ignore_files; do
+              ignore_directory=$(dirname "$ignore_file")
+              # if directory of ignore_file is beginning of file
+              if [[ "$file" == "$ignore_directory"* ]]; then
+                echo "ignoring file: ${file}"
+                found_files="${found_files//${file}/}"
+                break 1
+              fi
+            done
+          done
+
+          # remove empty lines
+          found_files=$(echo "$found_files" | sed '/^\s*$/d')
+
+          echo "found cmake files: ${found_files}"
+
+          # do not quote to keep this as a single line
+          echo found_files=${found_files} >> $GITHUB_OUTPUT
+
+      - name: CMake - cmake-lint
+        if: always() && steps.cmake_files.outputs.found_files
+        run: |
+          cmake-lint --line-width 120 --tab-size 4 ${{ steps.cmake_files.outputs.found_files }}
+
+      - name: Docker - find files
+        id: dokcer_files
+        if: always()
+        run: |
+          found_files=$(find . -type f -iname "Dockerfile" -o -iname "*.dockerfile")
+
+          echo "found_files: ${found_files}"
+
+          # do not quote to keep this as a single line
+          echo found_files=${found_files} >> $GITHUB_OUTPUT
+
+      - name: Docker - hadolint
+        if: always() && steps.dokcer_files.outputs.found_files
+        run: |
+          docker pull hadolint/hadolint
+
+          # create hadolint config file
+          cat <<EOF > .hadolint.yaml
+          ---
+          ignored:
+            - DL3008
+            - DL3013
+            - DL3016
+            - DL3018
+            - DL3028
+            - DL3059
+          EOF
+
+          failed=0
+          failed_files=""
+
+          for file in ${{ steps.dokcer_files.outputs.found_files }}; do
+            echo "::group::${file}"
+            docker run --rm -i \
+              -e "NO_COLOR=0" \
+              -e "HADOLINT_VERBOSE=1" \
+              -v $(pwd)/.hadolint.yaml:/.config/hadolint.yaml \
+              hadolint/hadolint < $file || {
+                failed=1
+                failed_files="$failed_files $file"
+              }
+            echo "::endgroup::"
+          done
+
+          if [ $failed -ne 0 ]; then
+            echo "::error:: hadolint failed for the following files: $failed_files"
+            exit 1
+          fi
+
+      - name: Python - flake8
+        if: always()
+        run: |
+          python -m flake8 \
+            --color=always \
+            --verbose
+
+      - name: Python - nbqa flake8
+        if: always()
+        run: |
+          python -m nbqa flake8 \
+            --color=always \
+            --verbose \
+            .
+
+      - name: Python - nb-clean
+        if: always()
+        run: |
+          output=$(find . -name '*.ipynb' -exec nb-clean check {} \;)
+
+          # fail if there are any issues
+          if [ -n "$output" ]; then
+            echo "$output"
+            exit 1
+          fi
+
+      - name: YAML - find files
+        id: yaml_files
+        if: always()
+        run: |
+          # space separated list of files
+          FILES=.clang-format
+
+          # empty placeholder
+          found_files=""
+
+          for FILE in ${FILES}; do
+            if [ -f "$FILE" ]
+            then
+              found_files="$found_files $FILE"
+            fi
+          done
+
+          echo "found_files=${found_files}" >> $GITHUB_OUTPUT
+
+      - name: YAML - yamllint
+        id: yamllint
+        if: always()
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          # https://yamllint.readthedocs.io/en/stable/configuration.html#default-configuration
+          config_data: |
+            extends: default
+            rules:
+              comments:
+                level: error
+              document-start:
+                level: error
+              line-length:
+                max: 120
+              new-line-at-end-of-file:
+                level: error
+              new-lines:
+                type: unix
+              truthy:
+                # GitHub uses "on" for workflow event triggers
+                # .clang-format file has options of "Yes" "No" that will be caught by this, so changed to "warning"
+                allowed-values: ['true', 'false', 'on']
+                check-keys: true
+                level: warning
+          file_or_dir: . ${{ steps.yaml_files.outputs.found_files }}
+
+      - name: YAML - log
+        if: always() && steps.yamllint.outcome == 'failure'
+        run: |
+          cat "${{ steps.yamllint.outputs.logfile }}" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/cpp-lint.yml b/.github/workflows/cpp-lint.yml
deleted file mode 100644
index 96cb1d06194..00000000000
--- a/.github/workflows/cpp-lint.yml
+++ /dev/null
@@ -1,120 +0,0 @@
----
-# This action is centrally managed in https://github.com/<organization>/.github/
-# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
-# the above-mentioned repo.
-
-# Lint c++ source files and cmake files.
-
-name: C++ Lint
-
-on:
-  pull_request:
-    branches: [master]
-    types: [opened, synchronize, reopened]
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  clang-format:
-    name: Clang Format Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Find cpp files
-        id: find_files
-        run: |
-          # find files
-          found_files=$(find . -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.m" -o -iname "*.mm")
-          ignore_files=$(find . -type f -iname ".clang-format-ignore")
-
-          # Loop through each C++ file
-          for file in $found_files; do
-            for ignore_file in $ignore_files; do
-              ignore_directory=$(dirname "$ignore_file")
-              # if directory of ignore_file is beginning of file
-              if [[ "$file" == "$ignore_directory"* ]]; then
-                echo "ignoring file: ${file}"
-                found_files="${found_files//${file}/}"
-                break 1
-              fi
-            done
-          done
-
-          # remove empty lines
-          found_files=$(echo "$found_files" | sed '/^\s*$/d')
-
-          echo "found cpp files: ${found_files}"
-
-          # do not quote to keep this as a single line
-          echo found_files=${found_files} >> $GITHUB_OUTPUT
-
-      - name: Clang format lint
-        if: ${{ steps.find_files.outputs.found_files }}
-        uses: DoozyX/clang-format-lint-action@v0.18
-        with:
-          source: ${{ steps.find_files.outputs.found_files }}
-          extensions: 'cpp,h,m,mm'
-          clangFormatVersion: 16
-          style: file
-          inplace: false
-
-      - name: Upload Artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: clang-format-fixes
-          path: ${{ steps.find_files.outputs.found_files }}
-
-  cmake-lint:
-    name: CMake Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools cmakelang
-
-      - name: Find cmake files
-        id: find_files
-        run: |
-          # find files
-          found_files=$(find . -type f -iname "CMakeLists.txt" -o -iname "*.cmake")
-          ignore_files=$(find . -type f -iname ".cmake-lint-ignore")
-
-          # Loop through each C++ file
-          for file in $found_files; do
-            for ignore_file in $ignore_files; do
-              ignore_directory=$(dirname "$ignore_file")
-              # if directory of ignore_file is beginning of file
-              if [[ "$file" == "$ignore_directory"* ]]; then
-                echo "ignoring file: ${file}"
-                found_files="${found_files//${file}/}"
-                break 1
-              fi
-            done
-          done
-
-          # remove empty lines
-          found_files=$(echo "$found_files" | sed '/^\s*$/d')
-
-          echo "found cmake files: ${found_files}"
-
-          # do not quote to keep this as a single line
-          echo found_files=${found_files} >> $GITHUB_OUTPUT
-
-      - name: Test with cmake-lint
-        run: |
-          cmake-lint --line-width 120 --tab-size 4 ${{ steps.find_files.outputs.found_files }}
diff --git a/.github/workflows/python-flake8.yml b/.github/workflows/python-flake8.yml
deleted file mode 100644
index 6077a9579d2..00000000000
--- a/.github/workflows/python-flake8.yml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-# This action is centrally managed in https://github.com/<organization>/.github/
-# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
-# the above-mentioned repo.
-
-# Lint python files with flake8.
-
-name: flake8
-
-on:
-  pull_request:
-    branches: [master]
-    types: [opened, synchronize, reopened]
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  flake8:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5  # https://github.com/actions/setup-python
-        with:
-          python-version: '3.12'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade \
-            pip \
-            setuptools \
-            wheel \
-            flake8 \
-            nb-clean \
-            nbqa[toolchain]
-
-      - name: Test with flake8
-        run: |
-          python -m flake8 \
-            --color=always \
-            --verbose
-
-      - name: Test with nbqa
-        run: |
-          python -m nbqa flake8 \
-            --color=always \
-            --verbose \
-            .
-
-      - name: Test with nb-clean
-        run: |
-          output=$(find . -name '*.ipynb' -exec nb-clean check {} \;)
-
-          # fail if there are any issues
-          if [ -n "$output" ]; then
-            echo "$output"
-            exit 1
-          fi
diff --git a/.github/workflows/release-notifier.yml b/.github/workflows/release-notifier.yml
index 2d1e632ddf7..1ac8a3a3d2e 100644
--- a/.github/workflows/release-notifier.yml
+++ b/.github/workflows/release-notifier.yml
@@ -28,7 +28,7 @@ jobs:
         id: output
         run: |
           echo "${RELEASE_BODY}" > ./release_body.md
-          modified_body=$(sed '/^---$/d; /^## Contributors$/,/<\/a>/d' ./release_body.md)
+          modified_body=$(sed '/^---/,$d' ./release_body.md)
           echo "modified_body: ${modified_body}"
 
           # use a heredoc to ensure the output is multiline
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
deleted file mode 100644
index 023b836c0ce..00000000000
--- a/.github/workflows/yaml-lint.yml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-# This action is centrally managed in https://github.com/<organization>/.github/
-# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
-# the above-mentioned repo.
-
-# Lint yaml files.
-
-name: yaml lint
-
-on:
-  pull_request:
-    branches: [master]
-    types: [opened, synchronize, reopened]
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: true
-
-jobs:
-  yaml-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Find additional files
-        id: find-files
-        run: |
-          # space separated list of files
-          FILES=.clang-format
-
-          # empty placeholder
-          FOUND=""
-
-          for FILE in ${FILES}; do
-            if [ -f "$FILE" ]
-            then
-              FOUND="$FOUND $FILE"
-            fi
-          done
-
-          echo "found=${FOUND}" >> $GITHUB_OUTPUT
-
-      - name: yaml lint
-        id: yaml-lint
-        uses: ibiqlik/action-yamllint@v3
-        with:
-          # https://yamllint.readthedocs.io/en/stable/configuration.html#default-configuration
-          config_data: |
-            extends: default
-            rules:
-              comments:
-                level: error
-              line-length:
-                max: 120
-              truthy:
-                # GitHub uses "on" for workflow event triggers
-                # .clang-format file has options of "Yes" "No" that will be caught by this, so changed to "warning"
-                allowed-values: ['true', 'false', 'on']
-                check-keys: true
-                level: warning
-          file_or_dir: . ${{ steps.find-files.outputs.found }}
-
-      - name: Log
-        run: |
-          cat "${{ steps.yaml-lint.outputs.logfile }}" >> $GITHUB_STEP_SUMMARY
diff --git a/src/platform/linux/graphics.cpp b/src/platform/linux/graphics.cpp
index 2ba97759d8b..8ffba6675ea 100644
--- a/src/platform/linux/graphics.cpp
+++ b/src/platform/linux/graphics.cpp
@@ -19,7 +19,7 @@ extern "C" {
 // They aren't likely to change any time soon.
 #define fourcc_code(a, b, c, d) ((std::uint32_t)(a) | ((std::uint32_t)(b) << 8) | \
                                  ((std::uint32_t)(c) << 16) | ((std::uint32_t)(d) << 24))
-#define fourcc_mod_code(vendor, val) ((((uint64_t) vendor) << 56) | ((val) &0x00ffffffffffffffULL))
+#define fourcc_mod_code(vendor, val) ((((uint64_t) vendor) << 56) | ((val) & 0x00ffffffffffffffULL))
 #define DRM_FORMAT_MOD_INVALID fourcc_mod_code(0, ((1ULL << 56) - 1))
 
 #if !defined(SUNSHINE_SHADERS_DIR)  // for testing this needs to be defined in cmake as we don't do an install
diff --git a/src/platform/linux/x11grab.cpp b/src/platform/linux/x11grab.cpp
index bcb2ff306f7..44c37609387 100644
--- a/src/platform/linux/x11grab.cpp
+++ b/src/platform/linux/x11grab.cpp
@@ -618,8 +618,7 @@ namespace platf {
     }
 
     ~shm_attr_t() override {
-      while (!task_pool.cancel(refresh_task_id))
-        ;
+      while (!task_pool.cancel(refresh_task_id));
     }
 
     capture_e
diff --git a/src/platform/windows/display_wgc.cpp b/src/platform/windows/display_wgc.cpp
index 1df60fcd8e0..d50e9ccf047 100644
--- a/src/platform/windows/display_wgc.cpp
+++ b/src/platform/windows/display_wgc.cpp
@@ -37,7 +37,7 @@ namespace winrt {
 #if WINRT_IMPL_HAS_DECLSPEC_UUID
     __declspec(uuid("A9B3D012-3DF2-4EE3-B8D1-8695F457D3C1"))
 #endif
-      IDirect3DDxgiInterfaceAccess: ::IUnknown {
+    IDirect3DDxgiInterfaceAccess: ::IUnknown {
     virtual HRESULT __stdcall GetInterface(REFIID id, void **object) = 0;
   };
 }  // namespace winrt