diff --git a/.github/workflows/deploy_all.yml b/.github/workflows/deploy_all.yml
index 8b0925e688..3417ea7d0a 100644
--- a/.github/workflows/deploy_all.yml
+++ b/.github/workflows/deploy_all.yml
@@ -24,7 +24,7 @@ jobs:
     needs: enumerate_targets
     strategy:
       matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: px4io/px4-dev-${{ matrix.container }}:2021-09-08
+    container: ${{ matrix.container }}
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/Tools/generate_board_targets_json.py b/Tools/generate_board_targets_json.py
index 83b21e9a74..7def257d65 100755
--- a/Tools/generate_board_targets_json.py
+++ b/Tools/generate_board_targets_json.py
@@ -61,18 +61,19 @@ def process_target(px4board_file, target_name):
 
     if platform not in excluded_platforms:
         # get the container based on the platform and toolchain
-        container = platform
         if platform == 'posix':
-            container = 'base-focal'
+            container = 'px4io/px4-dev-base-focal:2021-09-08'
             if toolchain:
                 if toolchain.startswith('aarch64'):
-                    container = 'aarch64'
+                    container = 'px4io/px4-dev-aarch64:2021-09-08'
                 elif toolchain == 'arm-linux-gnueabihf':
-                    container = 'armhf'
+                    container = 'px4io/px4-dev-armhf:2021-09-08'
                 else:
-                    if verbose: print(f'possibly unmatched toolchain: {toolchain}')
+                    if verbose: print(f'unmatched toolchain: {toolchain}')
         elif platform == 'nuttx':
-            container = 'nuttx-focal'
+            container = 'px4io/px4-dev-nuttx-focal:2021-09-08'
+        else:
+            if verbose: print(f'unmatched platform: {platform}')
 
         ret = {'target': target_name, 'container': container}
 
@@ -113,4 +114,3 @@ extra_args = {}
 if args.pretty:
     extra_args['indent'] = 2
 print(json.dumps(github_action_config, **extra_args))
-