diff --git a/.github/workflows/test_dds.yml b/.github/workflows/colcon.yml
similarity index 85%
rename from .github/workflows/test_dds.yml
rename to .github/workflows/colcon.yml
index b579b78c7fa9ce..14496fb1e22b5d 100644
--- a/.github/workflows/test_dds.yml
+++ b/.github/workflows/colcon.yml
@@ -1,4 +1,4 @@
-name: test dds
+name: colcon build/test
 
 on:
   push:
@@ -142,14 +142,8 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ardupilot/ardupilot-dev-ros:latest
-      options: --user 1001
     strategy:
       fail-fast: false  # don't cancel if a job from the matrix fails
-      matrix:
-        config: [
-            sitl,
-            stm32h7
-        ]
     steps:
       # git checkout the PR
       - uses: actions/checkout@v4
@@ -166,21 +160,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.ccache
-          key: ${{github.workflow}}-ccache-${{ matrix.config }}-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-          restore-keys: ${{github.workflow}}-ccache-${{ matrix.config }}-  # restore ccache from either previous build on this branch or on master
+          key: ${{github.workflow}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+          restore-keys: ${{github.workflow}}-ccache-  # restore ccache from either previous build on this branch or on master
       - name: setup ccache
         run: |
           . src/ardupilot/.github/workflows/ccache.env
-      # - name: test ${{matrix.config}}
-      #   env:
-      #     CI_BUILD_TARGET: dds-${{matrix.config}}
-      #   shell: 'script -q -e -c "bash {0}"'
-      #   run: |
-      #     git config --global --add safe.directory ${GITHUB_WORKSPACE}
-      #     PATH="/github/home/.local/bin:$PATH"
-      #     Tools/scripts/build_ci.sh
       # https://ardupilot.org/dev/docs/ros2.html#installation-ubuntu
-      - name: Build with colcon
+      - name: Build and test with colcon
         env:
           DEBIAN_FRONTEND: noninteractive
           TZ: Europe/Paris
@@ -210,11 +196,4 @@ jobs:
           colcon build --packages-up-to ardupilot_dds_tests --cmake-args -DBUILD_TESTING=ON
           colcon test --packages-select ardupilot_dds_tests
           colcon test-result --all --verbose
-     
-      - name: Archive buildlog artifacts
-        uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-           name: fail-${{matrix.config}}
-           path: /tmp/buildlogs
-           retention-days: 14
+