diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 535163461388..179f922cd651 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -11,23 +11,18 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:pr-24039
+    container: px4io/px4-dev-clang:2021-09-08
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - name: Git ownership workaround
-      run: git config --system --add safe.directory '*'
-
-    - name: Install missing deps
-      run: apt-get --quiet -y update && DEBIAN_FRONTEND=noninteractive apt-get --quiet -y install clang
-
-    - uses: corrupt952/actions-retry-command@v1.0.7
+    - name: Build Tidy
+      uses: addnab/docker-run-action@v3
       with:
-        command: make clang-tidy-quiet
-        max_attempts: 3
-
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
+        image: px4io/px4-dev-nuttx-focal:2022-08-12
+        options: -v ${{ github.workspace }}:/workspace
+        run: |
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          make clang-tidy-quiet
diff --git a/.github/workflows/ekf_functional_change_indicator.yml b/.github/workflows/ekf_functional_change_indicator.yml
index 506c1e415eae..7be3cd59c563 100644
--- a/.github/workflows/ekf_functional_change_indicator.yml
+++ b/.github/workflows/ekf_functional_change_indicator.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:1.16.0-alpha2
     steps:
     - uses: actions/checkout@v4
       with:
@@ -18,7 +17,14 @@ jobs:
       run: git config --system --add safe.directory '*'
 
     - name: main test
-      run: make tests TESTFILTER=EKF
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-base-focal:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
+        run: |
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          make tests TESTFILTER=EKF
 
     - name: Check if there is a functional change
       run: git diff --exit-code
diff --git a/.github/workflows/ekf_update_change_indicator.yml b/.github/workflows/ekf_update_change_indicator.yml
index 1ca15456b31f..15fcc778779a 100644
--- a/.github/workflows/ekf_update_change_indicator.yml
+++ b/.github/workflows/ekf_update_change_indicator.yml
@@ -5,7 +5,7 @@ on: push
 jobs:
   unit_tests:
     runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:1.16.0-alpha2
+    # container: ghcr.io/px4/px4-dev:1.16.0-alpha2
     env:
       GIT_COMMITTER_EMAIL: bot@px4.io
       GIT_COMMITTER_NAME: PX4BuildBot
@@ -14,11 +14,15 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Git ownership workaround
-      run: git config --system --add safe.directory '*'
-
-    - name: main test updates change indication files
-      run: make tests TESTFILTER=EKF
+    - name: main test
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-base-focal:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
+        run: |
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          make tests TESTFILTER=EKF
 
     - name: Check if there exists diff and save result in variable
       run: echo "CHANGE_INDICATED=$(git diff --exit-code --output=/dev/null || echo $?)" >> $GITHUB_ENV
diff --git a/.github/workflows/failsafe_sim.yml b/.github/workflows/failsafe_sim.yml
index a6b9df1efc7c..7db07827877d 100644
--- a/.github/workflows/failsafe_sim.yml
+++ b/.github/workflows/failsafe_sim.yml
@@ -20,30 +20,23 @@ jobs:
         check: [
           "failsafe_web",
         ]
-    container:
-      image: ghcr.io/px4/px4-dev:1.16.0-alpha2
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - name: Git ownership workaround
-      run: git config --system --add safe.directory '*'
-
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-
-    - name: install emscripten
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk
-        cd _emscripten_sdk
-        ./emsdk install latest
-        ./emsdk activate latest
-
-    - name: ${{matrix.check}}
-      run: |
-        . ./_emscripten_sdk/emsdk_env.sh
-        make ${{matrix.check}}
+    - name: ${{ matrix.check }}
+      uses: addnab/docker-run-action@v3
+      with:
+        image: px4io/px4-dev-base-focal:2021-09-08
+        options: -v ${{ github.workspace }}:/workspace
+        run: |
+          cd /workspace
+          git config --global --add safe.directory /workspace
+          git clone https://github.com/emscripten-core/emsdk.git _emscripten_sdk
+          cd _emscripten_sdk
+          ./emsdk install latest
+          ./emsdk activate latest
+          cd /workspace
+          . ./_emscripten_sdk/emsdk_env.sh
+          make ${{matrix.check}}