diff --git a/.github/workflows/ros2-build.yml b/.github/workflows/ros2-build.yml
index 2fe6d7b..7d6bfe9 100644
--- a/.github/workflows/ros2-build.yml
+++ b/.github/workflows/ros2-build.yml
@@ -5,8 +5,12 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  build_and_test_ros2:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macOS-latest, windows-latest]
     steps:
       - uses: ros-tooling/setup-ros@v0.7
         with:
@@ -15,3 +19,18 @@ jobs:
         with:
           package-name: modelec_utils
           target-ros2-distro: jazzy
+
+  build_docker:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:noble
+    steps:
+      - name: Setup ROS
+        uses: ros-tooling/setup-ros@v0.7
+        with:
+          required-ros-distributions: jazzy
+
+      - uses: ros-tooling/action-ros-ci@v0.4
+        with:
+          package-name: modelec_utils
+          target-ros2-distro: jazzy