diff --git a/.github/workflows/ros2.yml b/.github/workflows/ros2.yml
index 427b3ff..2eebbf2 100644
--- a/.github/workflows/ros2.yml
+++ b/.github/workflows/ros2.yml
@@ -22,13 +22,14 @@ jobs:
         uses: jenseng/dynamic-uses@v1
         with:
           uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }}
-          with: '{ "base-image": "rwthika/ros2:jazzy", "command": "ros2 topic list", "platform": "amd64", "target": "dev,run", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true"}'
+          with: '{ "base-image": "rwthika/ros2:jazzy", "rmw-implementation": "rmw_zenoh_cpp", "command": "ros2 topic list", "platform": "amd64", "target": "dev,run", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true"}'
 
       - name: docker-ros
         if: ${{ github.event_name == 'push' }}
         uses: ika-rwth-aachen/docker-ros@main
         with:
           base-image: rwthika/ros2:jazzy
+          rmw-implementation: rmw_zenoh_cpp
           command: ros2 topic list
           platform: amd64
           target: dev,run
@@ -42,7 +43,7 @@ jobs:
     strategy:
       matrix:
         target: [dev, run]
-        platform: [amd64, arm64]  
+        platform: [amd64, arm64]
     steps:
 
       - name: docker-ros
@@ -50,13 +51,14 @@ jobs:
         uses: jenseng/dynamic-uses@v1
         with:
           uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }}
-          with: '{ "base-image": "rwthika/ros2:jazzy", "command": "ros2 topic list", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}'
-  
+          with: '{ "base-image": "rwthika/ros2:jazzy", "rmw-implementation": "rmw_zenoh_cpp", "command": "ros2 topic list", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros2", "image-tag": "ros2", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}'
+
       - name: docker-ros
         if: ${{ github.event_name == 'push' }}
         uses: ika-rwth-aachen/docker-ros@main
         with:
           base-image: rwthika/ros2:jazzy
+          rmw-implementation: rmw_zenoh_cpp
           command: ros2 topic list
           platform: ${{ matrix.platform }}
           target: ${{ matrix.target }}