diff --git a/.github/workflows/deploy_all.yml b/.github/workflows/deploy_all.yml
index d65e7b201c..4ea841a49b 100644
--- a/.github/workflows/deploy_all.yml
+++ b/.github/workflows/deploy_all.yml
@@ -6,23 +6,10 @@ on:
     - '*'
 
 jobs:
-  enumerate_targets:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-base-focal:2021-09-08
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-    - id: set-matrix
-      run: echo "::set-output name=matrix::$(./Tools/generate_board_targets_json.py)"
   build:
     runs-on: ubuntu-latest
     needs: enumerate_targets
-    strategy:
-      matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: px4io/px4-dev-${{ matrix.container }}:2021-09-08
+    container: px4io/px4-dev-nuttx-focal:2021-09-08
     steps:
     - uses: actions/checkout@v1
       with:
@@ -34,8 +21,8 @@ jobs:
     - name: parameter & events metadata
       run: |
         make ${{matrix.target}} ver_gen events_json actuators_json
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/${{ matrix.target }} >> $GITHUB_ENV
-        cd build/${{ matrix.target }}
+        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_fmu-v5_default >> $GITHUB_ENV
+        cd build/px4_fmu-v5_default
         mkdir _metadata || true
         cp parameters.* events/*.xz actuators.json* _metadata
 
@@ -47,9 +34,9 @@ jobs:
         AWS_ACCESS_KEY_ID: ASDFJJGS + DFS ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ASDF ASDF + ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_REGION: 'us-west-1'
-        SOURCE_DIR: 'build/${{ matrix.target }}/_metadata/'
-        DEST_DIR: 'Firmware/${{ env.version }}/${{ matrix.target }}/'
+        SOURCE_DIR: 'build/px4_fmu-v5_default/_metadata/'
+        DEST_DIR: 'Firmware/${{ env.version }}/px4_fmu-v5_default/'
 
     - name: Check environment variables
-      run: echo $GITHUB_ENV && echo "\n\n" && echo "${{env}}"
+      run: echo $GITHUB_ENV && echo "\n\n" && echo "${{env}}" && echo "\n\n" && env