diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a9ad1a2c8..a34e5b736 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -16,21 +16,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  clang-tidy:
-    runs-on: ubuntu-latest
-    container: egecetinn/ubuntu2204
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
-        with:
-          submodules: recursive
-      - name: Prepare
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Configure
-        run: cmake -S . -B build
-      - name: Clang-tidy
-        run: run-clang-tidy -j`nproc` -p=build -header-filter=`pwd`/include/ src/*.cpp src/**/*.cpp
-
   format:
     runs-on: ubuntu-latest
     container: egecetinn/alpine
@@ -41,6 +26,10 @@ jobs:
         run: clang-format include/**/*.hpp src/*.cpp src/**/*.cpp --verbose --dry-run --Werror
       - name: Run cppcheck
         run: cppcheck -Iinclude/ src --verbose --enable=all --error-exitcode=1 --std=c++14 --language=c++ --suppressions-list=cppcheckSuppressions.txt --inline-suppr --check-level=exhaustive
+      - name: Configure for clang-tidy
+        run: cmake -S . -B build
+      - name: Clang-tidy
+        run: run-clang-tidy -j`nproc` -p=build -header-filter=`pwd`/include/ src/*.cpp src/**/*.cpp
 
   memleak:
     runs-on: ubuntu-latest
@@ -75,7 +64,7 @@ jobs:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
 
-  fuzzer:
+  fuzztests:
     runs-on: ubuntu-latest
     container: egecetinn/ubuntu2204
     strategy:
@@ -117,7 +106,7 @@ jobs:
           name: regressions-${{ matrix.sanitizer }}
           path: build/tests/fuzztests/crash*
 
-  rockylinux:
+  unittests:
     runs-on: ubuntu-latest
     container: egecetinn/${{ matrix.image }}
     strategy:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b7bdd3fc4..6ff474f54 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,9 +31,6 @@ jobs:
       uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         submodules: recursive
-    - name: Prepare system
-      run:  |
-        sudo apt update && sudo apt install libcurl4-openssl-dev -y
     - name: Initialize CodeQL
       uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 5162b4e93..cc841840e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,8 +13,8 @@ jobs:
   deploy:
     permissions:
       contents: write  # for JamesIves/github-pages-deploy-action to push changes in repo
-    runs-on: ubuntu-22.04
-    container: egecetinn/ubuntu2204
+    runs-on: ubuntu-latest
+    container: egecetinn/alpine
     steps:
       - name: Checkout repository
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0