diff --git a/Tools/ci/generate_board_targets_json.py b/Tools/ci/generate_board_targets_json.py
index 961345377d..43605630f5 100755
--- a/Tools/ci/generate_board_targets_json.py
+++ b/Tools/ci/generate_board_targets_json.py
@@ -86,26 +86,17 @@ def process_target(px4board_file, target_name):
     assert platform, f"PLATFORM not found in {px4board_file}"
 
     if platform not in excluded_platforms:
-        # get the container based on the platform and toolchain
-        # TODO enable once newer container is validated
-        # container = 'ghcr.io/px4/px4-dev:v1.16.0-alpha2-419-gd48631e2ce'
+        container = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
         if platform == 'posix':
-            # TODO remove once newer container is validated
-            container = 'px4io/px4-dev-base-focal:2021-09-08'
             group = 'base'
             if toolchain:
                 if toolchain.startswith('aarch64'):
-                    # TODO remove once newer container is validated
-                    container = 'px4io/px4-dev-aarch64:2022-08-12'
                     group = 'aarch64'
                 elif toolchain == 'arm-linux-gnueabihf':
-                    # TODO remove once newer container is validated
-                    container = 'px4io/px4-dev-armhf:2023-06-26'
                     group = 'armhf'
                 else:
                     if verbose: print(f'unmatched toolchain: {toolchain}')
         elif platform == 'nuttx':
-            container = 'px4io/px4-dev:v1.16.0-ondemand'
             group = 'nuttx'
         else:
             if verbose: print(f'unmatched platform: {platform}')
@@ -129,10 +120,7 @@ if(verbose):
 # - Events
 metadata_targets = ['airframe_metadata', 'parameters_metadata', 'extract_events']
 grouped_targets['base'] = {}
-# TODO remove once newer container is validated
-grouped_targets['base']['container'] = 'px4io/px4-dev-base-focal:2021-09-08'
-# TODO enable once newer container is validated
-#grouped_targets['base']['container'] = 'ghcr.io/px4/px4-dev:v1.16.0-alpha2-419-gd48631e2ce'
+grouped_targets['base']['container'] = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
 grouped_targets['base']['manufacturers'] = {}
 grouped_targets['base']['manufacturers']['px4'] = []
 grouped_targets['base']['manufacturers']['px4'] += metadata_targets