diff --git a/.github/workflows/failsafe_sim.yml b/.github/workflows/failsafe_sim.yml
index e1bd34fb19..9ea9443edd 100644
--- a/.github/workflows/failsafe_sim.yml
+++ b/.github/workflows/failsafe_sim.yml
@@ -27,7 +27,7 @@ jobs:
           "failsafe_web",
         ]
     container:
-      image: px4io/px4-dev-nuttx-focal:2022-08-12
+      image: px4io/px4-dev:v1.16.0-ondemand
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
       - name: Install Node v20.18.0
diff --git a/.github/workflows/flash_analysis.yml b/.github/workflows/flash_analysis.yml
index 35718faa63..a6eb6d2a3e 100644
--- a/.github/workflows/flash_analysis.yml
+++ b/.github/workflows/flash_analysis.yml
@@ -28,7 +28,7 @@ jobs:
     name: Analyzing ${{ matrix.target }}
     runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev-nuttx-focal
+      image: px4io/px4-dev:v1.16.0-ondemand
     strategy:
       matrix:
         target: [px4_fmu-v5x, px4_fmu-v6x]
diff --git a/.github/workflows/nuttx_env_config.yml b/.github/workflows/nuttx_env_config.yml
index 0741616566..d24ae45ba1 100644
--- a/.github/workflows/nuttx_env_config.yml
+++ b/.github/workflows/nuttx_env_config.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Build PX4 and Run Test [${{ matrix.config }}]
       uses: addnab/docker-run-action@v3
       with:
-        image: px4io/px4-dev-nuttx-focal:2022-08-12
+        image: px4io/px4-dev:v1.16.0-ondemand
         options: -v ${{ github.workspace }}:/workspace
         run: |
           cd /workspace
diff --git a/Tools/ci/generate_board_targets_json.py b/Tools/ci/generate_board_targets_json.py
index b03eae9932..8a6c26df73 100755
--- a/Tools/ci/generate_board_targets_json.py
+++ b/Tools/ci/generate_board_targets_json.py
@@ -105,8 +105,7 @@ def process_target(px4board_file, target_name):
                 else:
                     if verbose: print(f'unmatched toolchain: {toolchain}')
         elif platform == 'nuttx':
-            # TODO remove once newer container is validated
-            container = 'px4io/px4-dev-nuttx-focal:2022-08-12'
+            container = 'px4io/px4-dev:v1.16.0-ondemand'
             group = 'nuttx'
         else:
             if verbose: print(f'unmatched platform: {platform}')