diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2e8770477..ca51ec2cc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -28,8 +28,8 @@ jobs:
     if: ${{ !github.event.pull_request.draft }}
 
     name: Analyze
-    runs-on: ${{ vars.CODEQL_RUNNER || 'ubuntu-24.04' }}
-    container: deskflow/deskflow:ubuntu-24.04-amd64
+    runs-on: ubuntu-latest
+    container: deskflow/deskflow:debian-13-amd64
     timeout-minutes: 20
 
     strategy:
diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
index 69dfc4cdc..e7865781c 100644
--- a/.github/workflows/sonarcloud-analysis.yml
+++ b/.github/workflows/sonarcloud-analysis.yml
@@ -11,8 +11,8 @@ jobs:
   sonarcloud-analysis:
     if: ${{ vars.SONAR_SCANNER_ENABLED }}
 
-    runs-on: ${{ vars.SONAR_SCANNER_RUNNER || 'ubuntu-24.04' }}
-    container: deskflow/deskflow:ubuntu-22.04-amd64
+    runs-on: ubuntu-latest
+    container: deskflow/deskflow:debian-13-amd64
     timeout-minutes: 20
 
     env:
@@ -39,13 +39,12 @@ jobs:
           distro: jammy
 
       - name: Install dependencies
-        run: |
-          ./scripts/install_deps.py
-          apt install curl unzip cmake -y
-          pip install gcovr
         env:
           # Prevent apt prompting for input.
           DEBIAN_FRONTEND: noninteractive
+        run: |
+          ./scripts/install_deps.py
+          apt install curl unzip cmake gcovr  -y
 
       - name: Install sonar-scanner and build-wrapper
         uses: sonarsource/sonarcloud-github-c-cpp@v3
diff --git a/.github/workflows/valgrind-analysis.yml b/.github/workflows/valgrind-analysis.yml
index cc416b49a..ade2854f7 100644
--- a/.github/workflows/valgrind-analysis.yml
+++ b/.github/workflows/valgrind-analysis.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   valgrind-analysis:
     runs-on: ubuntu-latest
-    container: deskflow/deskflow:ubuntu-22.04-amd64
+    container: deskflow/deskflow:debian-13-amd64
     timeout-minutes: 10
 
     steps: