diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f51beaa0..2820c408 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,14 +56,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [ bookworm, jammy ]
+        DEB_DISTRO: [ bookworm, jammy, noble ]
         BUILD_TIMEOUT: [ 0 ]
         include:
           # defaults (can be overriden with values from include w/o adding jobs)
           - { ROS_SOURCES: 'good', DEBS: false, VERBOSE: false }
           # override/add settings for specific distros
           - { DEB_DISTRO: bookworm, DEBS: true, VERBOSE: bloom }
-          - { DEB_DISTRO: jammy, VERBOSE: true }
+          - { DEB_DISTRO: noble, VERBOSE: true }
           - { DEB_DISTRO: jammy, BUILD_TIMEOUT: 3, ROS_SOURCES: 'good', DEBS: true, EXPECT_EXIT_CODE: 143 }
           # add failing jobs
           - { DEB_DISTRO: focal, ROS_SOURCES: broken, EXPECT_EXIT_CODE: 2, CONTINUE_ON_ERROR: false, DEBS: true }
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 254138e6..3d409707 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
         ROS_DISTRO: [one]
 
     uses: ./.github/workflows/docker.build.yaml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
 
     uses: ./.github/workflows/docker.build.yaml
     secrets: inherit
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
 
     uses: ./.github/workflows/docker.build.yaml
     secrets: inherit
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
 
     uses: ./.github/workflows/docker.build.yaml
     secrets: inherit
@@ -82,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
 
     uses: ./.github/workflows/docker.build.yaml
     secrets: inherit
@@ -97,7 +97,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DEB_DISTRO: [jammy]
+        DEB_DISTRO: [jammy, noble]
 
     uses: ./.github/workflows/docker.build.yaml
     secrets: inherit