diff --git a/.github/workflows/linux-arm64-build-and-test.yml b/.github/workflows/linux-arm64-build-and-test.yml
index dbca41ca..98a3cfe0 100644
--- a/.github/workflows/linux-arm64-build-and-test.yml
+++ b/.github/workflows/linux-arm64-build-and-test.yml
@@ -30,9 +30,13 @@ jobs:
         node-version: [22.X]
         architecture: [arm64]
         ros_distribution:
+          - humble
           - jazzy
           - kilted
         include:
+          # Humble Hawksbill (May 2022 - May 2027)
+          - docker_image: ubuntu:jammy
+            ros_distribution: humble
           # Jazzy Jalisco (May 2024 - May 2029)
           - docker_image: ubuntu:noble
             ros_distribution: jazzy
diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml
index 1a31e03d..f4cba976 100644
--- a/.github/workflows/windows-build-and-test.yml
+++ b/.github/workflows/windows-build-and-test.yml
@@ -27,15 +27,6 @@ jobs:
           - jazzy
           - kilted
           - rolling
-        include:
-          # Humble Hawksbill (May 2022 - May 2027)
-          - ros_distribution: humble
-          # Jazzy Jalisco (May 2024 - May 2029)
-          - ros_distribution: jazzy
-          # Kilted Kaiju (May 2025 - Dec 2026)
-          - ros_distribution: kilted
-          # Rolling Ridley (No End-Of-Life)
-          - ros_distribution: rolling
     steps:
     - name: Setup Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4