diff --git a/Jenkinsfile b/Jenkinsfile
index 9a177771b..6515e5f2d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -444,10 +444,10 @@ pipeline {
                       </table>''')
     choice(
       name: 'OS_VERSION',
-      choices: ['rocky/8-64/cpp',
-                'rocky/9-64/cpp',
-                'ubuntu/focal64/cpp',
-                'ubuntu/jammy64/cpp'],
+      choices: ['rocky/9-64/cpp',
+                'rocky/10-64/cpp',
+                'ubuntu/jammy64/cpp',
+                'ubuntu/noble64/cpp'],
       description: '''Operating system to use for scheduled or adhoc builds
                       <table style="width:100%">
                         <col width="20%">
@@ -456,22 +456,22 @@ pipeline {
                           <th align="left">Choice</th>
                           <th align="left">Description</th>
                         </tr>
-                        <tr>
-                          <td><strong>rocky/8-64/cpp</strong></td>
-                          <td>Rocky Linux 8 x86_64</td>
-                        </tr>
                         <tr>
                           <td><strong>rocky/9-64/cpp</strong></td>
                           <td>Rocky Linux 9 x86_64</td>
                         </tr>
                         <tr>
-                          <td><strong>ubuntu/focal64/cpp</strong></td>
-                          <td>Ubuntu 20.04 LTS x86_64</td>
+                          <td><strong>rocky/10-64/cpp</strong></td>
+                          <td>Rocky Linux 10 x86_64</td>
                         </tr>
                         <tr>
                           <td><strong>ubuntu/jammy64/cpp</strong></td>
                           <td>Ubuntu 22.04 LTS x86_64</td>
                         </tr>
+                        <tr>
+                          <td><strong>ubuntu/noble64/cpp</strong></td>
+                          <td>Ubuntu 24.04 LTS x86_64</td>
+                        </tr>
                       </table>''')
     string(
       name: 'INTEGRATION_TESTS_FILTER',
@@ -516,10 +516,10 @@ pipeline {
         axes {
           axis {
             name 'OS_VERSION'
-            values 'rocky/8-64/cpp',
-                   'rocky/9-64/cpp',
-                   'ubuntu/focal64/cpp',
-                   'ubuntu/jammy64/cpp'
+            values 'rocky/9-64/cpp',
+                   'rocky/10-64/cpp',
+                   'ubuntu/jammy64/cpp',
+                   'ubuntu/noble64/cpp'
           }
         }
 
@@ -639,10 +639,10 @@ pipeline {
         axes {
           axis {
             name 'OS_VERSION'
-            values 'rocky/8-64/cpp',
-                   'rocky/9-64/cpp',
-                   'ubuntu/focal64/cpp',
-                   'ubuntu/jammy64/cpp'
+            values 'rocky/9-64/cpp',
+                   'rocky/10-64/cpp',
+                   'ubuntu/jammy64/cpp',
+                   'ubuntu/noble64/cpp'
           }
         }