diff --git a/IaC/init.groovy.d/ami-defs.properties b/IaC/init.groovy.d/ami-defs.properties
index c3d34c0a82..bcc484483a 100644
--- a/IaC/init.groovy.d/ami-defs.properties
+++ b/IaC/init.groovy.d/ami-defs.properties
@@ -254,4 +254,25 @@ AwsAmi {
 
     user       = "ubuntu"
   }
+
+  // Ubuntu 24.04 (Noble) AMIs
+  Ubuntu2404_x86_64 {
+    euCentral1 = "ami-01e444924a2233b07"
+    euWest1    = "ami-0776c814353b4814d"
+    usEast2    = "ami-075e395c96a011fee"
+    usWest1    = "ami-08012c0a9ee8e21c4"
+    usWest2    = "ami-0cf2b4e024cdb6960"
+
+    user       = "ubuntu"
+  }
+
+  Ubuntu2404_aarch64 {
+    euCentral1 = "ami-099b7bab1b9843525"
+    euWest1    = "ami-0a636034c582e2138"
+    usEast2    = "ami-0eac975a54dfee8cb"
+    usWest1    = "ami-02404fb4d4dc3c0c7"
+    usWest2    = "ami-0c29a2c5cf69b5a9c"
+
+    user       = "ubuntu"
+  }
 }
diff --git a/IaC/init.groovy.d/ami-defs.properties.sha256 b/IaC/init.groovy.d/ami-defs.properties.sha256
index 4974695ed5..acf2053d8e 100644
--- a/IaC/init.groovy.d/ami-defs.properties.sha256
+++ b/IaC/init.groovy.d/ami-defs.properties.sha256
@@ -1 +1 @@
-76e448bb7d16744b4ce4bd1079d30d10b8f4eff75dc362fde87d2dc7fbfe0350
+26a1860e9975def51bb316bbcb36296d63e10de4dfc1863a3fe2cda7f1d6f53e
diff --git a/IaC/pmm.cd/init.groovy.d/cloud.groovy b/IaC/pmm.cd/init.groovy.d/cloud.groovy
index 0f94b54759..677fccbebd 100644
--- a/IaC/pmm.cd/init.groovy.d/cloud.groovy
+++ b/IaC/pmm.cd/init.groovy.d/cloud.groovy
@@ -32,6 +32,7 @@ imageMap['us-east-2a.min-ol-9-x64']       = imageMap['us-east-2a.min-rhel-9-x64'
 imageMap['us-east-2a.min-bionic-x64']     = 'ami-0bb220fc4bffd88dd'               // ubuntu 18
 imageMap['us-east-2a.min-focal-x64']      = 'ami-01936e31f56bdacde'               // ubuntu 20
 imageMap['us-east-2a.min-jammy-x64']      = 'ami-0e83be366243f524a'               // ubuntu 22
+imageMap['us-east-2a.min-noble-x64']      = 'ami-075e395c96a011fee'               // ubuntu 24
 imageMap['us-east-2a.min-stretch-x64']    = 'ami-0a694f67ea86df8a7'               // debian 9
 imageMap['us-east-2a.min-buster-x64']     = 'ami-0dc2cee9dad26918a'               // debian 10
 imageMap['us-east-2a.min-bullseye-x64']   = 'ami-023766a7f545f3c77'               // debian 11
@@ -46,6 +47,7 @@ imageMap['us-east-2b.min-ol-9-x64']       = imageMap['us-east-2a.min-rhel-9-x64'
 imageMap['us-east-2b.min-bionic-x64']     = imageMap['us-east-2a.min-bionic-x64']
 imageMap['us-east-2b.min-focal-x64']      = imageMap['us-east-2a.min-focal-x64']
 imageMap['us-east-2b.min-jammy-x64']      = imageMap['us-east-2a.min-jammy-x64']
+imageMap['us-east-2b.min-noble-x64']      = imageMap['us-east-2a.min-noble-x64']
 imageMap['us-east-2b.min-stretch-x64']    = imageMap['us-east-2a.min-stretch-x64']
 imageMap['us-east-2b.min-buster-x64']     = imageMap['us-east-2a.min-buster-x64']
 imageMap['us-east-2b.min-bullseye-x64']   = imageMap['us-east-2a.min-bullseye-x64']
@@ -60,6 +62,7 @@ imageMap['us-east-2c.min-ol-9-x64']       = imageMap['us-east-2a.min-rhel-9-x64'
 imageMap['us-east-2c.min-bionic-x64']     = imageMap['us-east-2a.min-bionic-x64']
 imageMap['us-east-2c.min-focal-x64']      = imageMap['us-east-2a.min-focal-x64']
 imageMap['us-east-2c.min-jammy-x64']      = imageMap['us-east-2a.min-jammy-x64']
+imageMap['us-east-2c.min-noble-x64']      = imageMap['us-east-2a.min-noble-x64']
 imageMap['us-east-2c.min-stretch-x64']    = imageMap['us-east-2a.min-stretch-x64']
 imageMap['us-east-2c.min-buster-x64']     = imageMap['us-east-2a.min-buster-x64']
 imageMap['us-east-2c.min-bullseye-x64']   = imageMap['us-east-2a.min-bullseye-x64']
@@ -82,6 +85,7 @@ userMap['min-ol-9-x64']      = 'ec2-user'
 userMap['min-focal-x64']     = 'ubuntu'
 userMap['min-bionic-x64']    = 'ubuntu'
 userMap['min-jammy-x64']     = 'ubuntu'
+userMap['min-noble-x64']     = 'ubuntu'
 userMap['min-stretch-x64']   = 'admin'
 userMap['min-buster-x64']    = 'admin'
 userMap['min-bullseye-x64']  = 'admin'
@@ -219,6 +223,7 @@ initMap['min-ol-9-x64']     = initMap['rpmMap']
 initMap['min-focal-x64']    = initMap['debMap']
 initMap['min-bionic-x64']   = initMap['debMap']
 initMap['min-jammy-x64']    = initMap['debMap']
+initMap['min-noble-x64']    = initMap['debMap']
 initMap['min-stretch-x64']  = initMap['debMap']
 initMap['min-bullseye-x64'] = initMap['debMap']
 initMap['min-bookworm-x64'] = initMap['debMap']
@@ -240,6 +245,7 @@ typeMap['min-ol-9-x64']     = typeMap['min-rhel-7-x64']
 typeMap['min-focal-x64']    = typeMap['min-rhel-7-x64']
 typeMap['min-bionic-x64']   = typeMap['min-rhel-7-x64']
 typeMap['min-jammy-x64']    = typeMap['min-rhel-7-x64']
+typeMap['min-noble-x64']    = typeMap['min-rhel-7-x64']
 typeMap['min-stretch-x64']  = typeMap['min-rhel-7-x64']
 typeMap['min-buster-x64']   = typeMap['min-rhel-7-x64']
 typeMap['min-bullseye-x64'] = typeMap['min-rhel-7-x64']
@@ -255,6 +261,7 @@ execMap['min-ol-9-x64']     = '1'
 execMap['min-focal-x64']    = '1'
 execMap['min-bionic-x64']   = '1'
 execMap['min-jammy-x64']    = '1'
+execMap['min-noble-x64']    = '1'
 execMap['min-stretch-x64']  = '1'
 execMap['min-buster-x64']   = '1'
 execMap['min-bullseye-x64'] = '1'
@@ -270,6 +277,7 @@ devMap['min-ol-9-x64']     = devMap['min-rhel-7-x64']
 devMap['min-focal-x64']    = devMap['min-rhel-7-x64']
 devMap['min-bionic-x64']   = devMap['min-rhel-7-x64']
 devMap['min-jammy-x64']    = devMap['min-rhel-7-x64']
+devMap['min-noble-x64']    = devMap['min-rhel-7-x64']
 devMap['min-stretch-x64']  = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
 devMap['min-buster-x64']   = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
 devMap['min-bullseye-x64'] = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
@@ -285,6 +293,7 @@ labelMap['min-ol-9-x64']     = 'min-ol-9-x64'
 labelMap['min-focal-x64']    = 'min-focal-x64'
 labelMap['min-bionic-x64']   = 'min-bionic-x64'
 labelMap['min-jammy-x64']    = 'min-jammy-x64'
+labelMap['min-noble-x64']    = 'min-noble-x64'
 labelMap['min-stretch-x64']  = 'min-stretch-x64'
 labelMap['min-buster-x64']   = 'min-buster-x64'
 labelMap['min-bullseye-x64'] = 'min-bullseye-x64'
@@ -300,6 +309,7 @@ jvmoptsMap['min-ol-9-x64']     = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-focal-x64']    = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-bionic-x64']   = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-jammy-x64']    = jvmoptsMap['min-rhel-7-x64']
+jvmoptsMap['min-noble-x64']    = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-stretch-x64']  = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-buster-x64']   = jvmoptsMap['min-rhel-7-x64']
 jvmoptsMap['min-bullseye-x64'] = jvmoptsMap['min-rhel-7-x64']
@@ -383,6 +393,7 @@ String region = 'us-east-2'
             getTemplate('min-focal-x64',     "${region}${it}"),
             getTemplate('min-bionic-x64',    "${region}${it}"),
             getTemplate('min-jammy-x64',     "${region}${it}"),
+            getTemplate('min-noble-x64',     "${region}${it}"),
             getTemplate('min-stretch-x64',   "${region}${it}"),
             getTemplate('min-buster-x64',    "${region}${it}"),
             getTemplate('min-bullseye-x64',  "${region}${it}"),
diff --git a/IaC/ps3.cd/init.groovy.d/cloud.groovy b/IaC/ps3.cd/init.groovy.d/cloud.groovy
index c157e2b4d9..ce9a7385a5 100644
--- a/IaC/ps3.cd/init.groovy.d/cloud.groovy
+++ b/IaC/ps3.cd/init.groovy.d/cloud.groovy
@@ -87,6 +87,7 @@ imageMap['eu-west-1a.min-xenial-x64']       = properties.AwsAmi['Ubuntu1604_x86_
 imageMap['eu-west-1a.docker-32gb-hirsute']  = properties.AwsAmi['Ubuntu2104_x86_64']['euWest1']
 imageMap['eu-west-1a.docker-32gb-focal']    = properties.AwsAmi['Ubuntu2004_x86_64']['euWest1']
 imageMap['eu-west-1a.docker-32gb-jammy']    = properties.AwsAmi['Ubuntu2204_x86_64']['euWest1']
+imageMap['eu-west-1a.docker-32gb-noble']    = properties.AwsAmi['Ubuntu2404_x86_64']['euWest1']
 imageMap['eu-west-1a.docker-32gb-bullseye'] = imageMap['eu-west-1a.min-bullseye-x64']
 
 imageMap['eu-west-1a.docker-32gb-aarch64']  = properties.AwsAmi['AmazonLinux2_aarch64']['euWest1']
@@ -94,6 +95,7 @@ imageMap['eu-west-1a.min-centos-7-aarch64'] = properties.AwsAmi['Centos7_aarch64
 imageMap['eu-west-1a.min-bookworm-aarch64'] = properties.AwsAmi['Debian12_aarch64']['euWest1']
 imageMap['eu-west-1a.min-bullseye-aarch64'] = properties.AwsAmi['Debian11_aarch64']['euWest1']
 imageMap['eu-west-1a.min-jammy-aarch64']    = properties.AwsAmi['Ubuntu2204_aarch64']['euWest1']
+imageMap['eu-west-1a.min-noble-aarch64']    = properties.AwsAmi['Ubuntu2404_aarch64']['euWest1']
 
 imageMap['eu-west-1b.docker']               = imageMap['eu-west-1a.docker']
 imageMap['eu-west-1b.docker-32gb']          = imageMap['eu-west-1a.docker-32gb']
@@ -114,6 +116,7 @@ imageMap['eu-west-1b.min-xenial-x64']       = imageMap['eu-west-1a.min-xenial-x6
 imageMap['eu-west-1b.docker-32gb-hirsute']  = imageMap['eu-west-1a.docker-32gb-hirsute']
 imageMap['eu-west-1b.docker-32gb-focal']    = imageMap['eu-west-1a.docker-32gb-focal']
 imageMap['eu-west-1b.docker-32gb-jammy']    = imageMap['eu-west-1a.docker-32gb-jammy']
+imageMap['eu-west-1b.docker-32gb-noble']    = imageMap['eu-west-1a.docker-32gb-noble']
 imageMap['eu-west-1b.docker-32gb-bullseye'] = imageMap['eu-west-1a.docker-32gb-bullseye']
 
 imageMap['eu-west-1b.docker-32gb-aarch64']    = imageMap['eu-west-1a.docker-32gb-aarch64']
@@ -121,6 +124,7 @@ imageMap['eu-west-1b.min-centos-7-aarch64']   = imageMap['eu-west-1a.min-centos-
 imageMap['eu-west-1b.min-bookworm-aarch64']   = imageMap['eu-west-1a.min-bookworm-aarch64']
 imageMap['eu-west-1b.min-bullseye-aarch64']   = imageMap['eu-west-1a.min-bullseye-aarch64']
 imageMap['eu-west-1b.min-jammy-aarch64']      = imageMap['eu-west-1a.min-jammy-aarch64']
+imageMap['eu-west-1b.min-noble-aarch64']      = imageMap['eu-west-1a.min-noble-aarch64']
 
 imageMap['eu-west-1c.docker']               = imageMap['eu-west-1a.docker']
 imageMap['eu-west-1c.docker-32gb']          = imageMap['eu-west-1a.docker-32gb']
@@ -141,6 +145,7 @@ imageMap['eu-west-1c.min-xenial-x64']       = imageMap['eu-west-1a.min-xenial-x6
 imageMap['eu-west-1c.docker-32gb-hirsute']  = imageMap['eu-west-1a.docker-32gb-hirsute']
 imageMap['eu-west-1c.docker-32gb-focal']    = imageMap['eu-west-1a.docker-32gb-focal']
 imageMap['eu-west-1c.docker-32gb-jammy']    = imageMap['eu-west-1a.docker-32gb-jammy']
+imageMap['eu-west-1c.docker-32gb-noble']    = imageMap['eu-west-1a.docker-32gb-noble']
 imageMap['eu-west-1c.docker-32gb-bullseye'] = imageMap['eu-west-1a.docker-32gb-bullseye']
 
 imageMap['eu-west-1c.docker-32gb-aarch64']    = imageMap['eu-west-1a.docker-32gb-aarch64']
@@ -148,6 +153,7 @@ imageMap['eu-west-1c.min-centos-7-aarch64']   = imageMap['eu-west-1a.min-centos-
 imageMap['eu-west-1c.min-bookworm-aarch64']   = imageMap['eu-west-1a.min-bookworm-aarch64']
 imageMap['eu-west-1c.min-bullseye-aarch64']   = imageMap['eu-west-1a.min-bullseye-aarch64']
 imageMap['eu-west-1c.min-jammy-aarch64']      = imageMap['eu-west-1a.min-jammy-aarch64']
+imageMap['eu-west-1c.min-noble-aarch64']      = imageMap['eu-west-1a.min-noble-aarch64']
 
 
 priceMap = [:]
@@ -176,6 +182,7 @@ userMap['min-buster-x64']       = properties.AwsAmi['Debian10_x86_64']['user']
 userMap['docker-32gb-hirsute']  = properties.AwsAmi['Ubuntu2104_x86_64']['user']
 userMap['docker-32gb-focal']    = properties.AwsAmi['Ubuntu2004_x86_64']['user']
 userMap['docker-32gb-jammy']    = properties.AwsAmi['Ubuntu2204_x86_64']['user']
+userMap['docker-32gb-noble']    = properties.AwsAmi['Ubuntu2404_x86_64']['user']
 userMap['docker-32gb-bullseye'] = properties.AwsAmi['Debian11_x86_64']['user']
 
 userMap['docker-32gb-aarch64']    = properties.AwsAmi['AmazonLinux2_aarch64']['user']
@@ -183,6 +190,7 @@ userMap['min-centos-7-aarch64']   = properties.AwsAmi['Centos7_aarch64']['user']
 userMap['min-bookworm-aarch64']   = properties.AwsAmi['Debian12_aarch64']['user']
 userMap['min-bullseye-aarch64']   = properties.AwsAmi['Debian11_aarch64']['user']
 userMap['min-jammy-aarch64']      = properties.AwsAmi['Ubuntu2204_aarch64']['user']
+userMap['min-noble-aarch64']      = properties.AwsAmi['Ubuntu2404_aarch64']['user']
 
 
 initMap = [:]
@@ -316,6 +324,7 @@ initMap['docker-32gb-hirsute'] = '''
 '''
 initMap['docker-32gb-focal'] = initMap['docker-32gb-hirsute']
 initMap['docker-32gb-jammy'] = initMap['docker-32gb-hirsute']
+initMap['docker-32gb-noble'] = initMap['docker-32gb-hirsute']
 
 initMap['docker-32gb-bullseye'] = '''
     set -o xtrace
@@ -516,6 +525,7 @@ initMap['min-centos-7-aarch64'] = initMap['rpmMap']
 initMap['min-bookworm-aarch64'] = initMap['debMap']
 initMap['min-bullseye-aarch64'] = initMap['debMap']
 initMap['min-jammy-aarch64']    = initMap['debMap']
+initMap['min-noble-aarch64']    = initMap['debMap']
 
 capMap = [:]
 capMap['c5n.2xlarge'] = '60'
@@ -543,6 +553,7 @@ typeMap['min-xenial-x64']    = typeMap['min-centos-7-x64']
 typeMap['docker-32gb-hirsute'] = 'i4i.2xlarge'
 typeMap['docker-32gb-focal'] = 'i4i.2xlarge'
 typeMap['docker-32gb-jammy'] = 'i4i.2xlarge'
+typeMap['docker-32gb-noble'] = 'i4i.2xlarge'
 typeMap['docker-32gb-bullseye'] = 'i4i.2xlarge'
 
 typeMap['docker-32gb-aarch64']  = 'r6g.2xlarge'
@@ -550,6 +561,7 @@ typeMap['min-centos-7-aarch64'] = typeMap['docker-32gb-aarch64']
 typeMap['min-bookworm-aarch64'] = typeMap['docker-32gb-aarch64']
 typeMap['min-bullseye-aarch64'] = typeMap['docker-32gb-aarch64']
 typeMap['min-jammy-aarch64']    = typeMap['docker-32gb-aarch64']
+typeMap['min-noble-aarch64']    = typeMap['docker-32gb-aarch64']
 
 execMap = [:]
 execMap['docker']            = '1'
@@ -568,6 +580,7 @@ execMap['min-buster-x64']    = '1'
 execMap['docker-32gb-hirsute'] = '1'
 execMap['docker-32gb-focal'] = '1'
 execMap['docker-32gb-jammy'] = '1'
+execMap['docker-32gb-noble'] = '1'
 execMap['min-bookworm-x64']  = '1'
 execMap['min-bullseye-x64']  = '1'
 execMap['docker-32gb-bullseye']  = '1'
@@ -577,6 +590,7 @@ execMap['min-centos-7-aarch64'] = '1'
 execMap['min-bookworm-aarch64'] = '1'
 execMap['min-bullseye-aarch64'] = '1'
 execMap['min-jammy-aarch64']    = '1'
+execMap['min-noble-aarch64']    = '1'
 
 devMap = [:]
 devMap['docker']            = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
@@ -596,6 +610,7 @@ devMap['min-buster-x64']    = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['docker-32gb-hirsute'] = devMap['docker']
 devMap['docker-32gb-focal'] = devMap['docker']
 devMap['docker-32gb-jammy'] = devMap['docker']
+devMap['docker-32gb-noble'] = devMap['docker']
 devMap['min-bookworm-x64']  = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['min-bullseye-x64']  = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['docker-32gb-bullseye']  = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
@@ -605,6 +620,7 @@ devMap['min-centos-7-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['min-bookworm-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['min-bullseye-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['min-jammy-aarch64']    = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
+devMap['min-noble-aarch64']    = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 
 labelMap = [:]
 labelMap['docker']            = ''
@@ -623,6 +639,7 @@ labelMap['min-buster-x64']    = ''
 labelMap['docker-32gb-hirsute'] = ''
 labelMap['docker-32gb-focal'] = ''
 labelMap['docker-32gb-jammy'] = ''
+labelMap['docker-32gb-noble'] = ''
 labelMap['min-bookworm-x64']  = ''
 labelMap['min-bullseye-x64']  = ''
 labelMap['docker-32gb-bullseye']  = ''
@@ -632,6 +649,7 @@ labelMap['min-centos-7-aarch64'] = ''
 labelMap['min-bookworm-aarch64'] = ''
 labelMap['min-bullseye-aarch64'] = ''
 labelMap['min-jammy-aarch64']    = ''
+labelMap['min-noble-aarch64']    = ''
 
 jvmoptsMap = [:]
 jvmoptsMap['docker']            = '-Xmx512m -Xms512m'
@@ -650,6 +668,7 @@ jvmoptsMap['min-buster-x64']    = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-hirsute'] = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-focal'] = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-jammy'] = jvmoptsMap['docker']
+jvmoptsMap['docker-32gb-noble'] = jvmoptsMap['docker']
 jvmoptsMap['min-bookworm-x64']  = '-Xmx512m -Xms512m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
 jvmoptsMap['min-bullseye-x64']  = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-bullseye']  = jvmoptsMap['docker']
@@ -659,6 +678,7 @@ jvmoptsMap['min-centos-7-aarch64'] = jvmoptsMap['docker']
 jvmoptsMap['min-bookworm-aarch64'] = jvmoptsMap['docker']
 jvmoptsMap['min-bullseye-aarch64'] = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-aarch64']    = jvmoptsMap['docker']
+jvmoptsMap['min-noble-aarch64']    = jvmoptsMap['docker']
 
 // https://github.com/jenkinsci/ec2-plugin/blob/ec2-1.41/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
 SlaveTemplate getTemplate(String OSType, String AZ) {
@@ -745,12 +765,14 @@ String region = 'eu-west-1'
             getTemplate('docker-32gb-hirsute',  "${region}${it}"),
             getTemplate('docker-32gb-focal',    "${region}${it}"),
             getTemplate('docker-32gb-jammy',    "${region}${it}"),
+            getTemplate('docker-32gb-noble',    "${region}${it}"),
             getTemplate('docker-32gb-bullseye', "${region}${it}"),
             getTemplate('docker-32gb-aarch64',  "${region}${it}"),
             getTemplate('min-centos-7-aarch64', "${region}${it}"),
             getTemplate('min-bookworm-aarch64', "${region}${it}"),
             getTemplate('min-bullseye-aarch64', "${region}${it}"),
             getTemplate('min-jammy-aarch64',    "${region}${it}"),
+            getTemplate('min-noble-aarch64',    "${region}${it}"),
         ],                                       // List<? extends SlaveTemplate> templates
         '',
         ''
diff --git a/IaC/ps57.cd/init.groovy.d/cloud.groovy b/IaC/ps57.cd/init.groovy.d/cloud.groovy
index d01bd20cf2..e8924b4721 100644
--- a/IaC/ps57.cd/init.groovy.d/cloud.groovy
+++ b/IaC/ps57.cd/init.groovy.d/cloud.groovy
@@ -30,12 +30,13 @@ imageMap['eu-central-1a.min-ol-8-x64']      = 'ami-065e2293a3df4c870'
 imageMap['eu-central-1a.min-ol-9-x64']      = 'ami-02952e732e6126584'
 imageMap['eu-central-1a.min-centos-8-x64']  = 'ami-0a2dc38dc30ba417e'
 imageMap['eu-central-1a.min-centos-7-x64']  = 'ami-04cf43aca3e6f3de3'
-imageMap['eu-central-1a.fips-centos-7-x64'] = 'ami-0837950ffca9ae6e8'
+imageMap['eu-central-1a.fips-centos-7-x64'] = 'ami-0f4ad402d76e82cbe'
 imageMap['eu-central-1a.min-centos-6-x64']  = 'ami-01fc903dce948db3f'
 imageMap['eu-central-1a.min-buster-x64']    = 'ami-0c984d7a384cafb51'
 imageMap['eu-central-1a.min-bullseye-x64']  = 'ami-08f13e5792295e1b2'
 imageMap['eu-central-1a.min-bookworm-x64']  = 'ami-04fc201ba10cb21bd'
 imageMap['eu-central-1a.min-jammy-x64']     = 'ami-0ec7f9846da6b0f61'
+imageMap['eu-central-1a.min-noble-x64']     = 'ami-01e444924a2233b07'
 imageMap['eu-central-1a.min-focal-x64']     = 'ami-0d497a49e7d359666'
 imageMap['eu-central-1a.min-bionic-x64']    = 'ami-0cc29ffa555d90047'
 imageMap['eu-central-1a.min-stretch-x64']   = 'ami-0d78ea9dc521d7ed3'
@@ -54,6 +55,7 @@ imageMap['eu-central-1b.fips-centos-7-x64'] = imageMap['eu-central-1a.fips-cento
 imageMap['eu-central-1b.min-centos-6-x64']  = imageMap['eu-central-1a.min-centos-6-x64']
 imageMap['eu-central-1b.min-buster-x64']    = imageMap['eu-central-1a.min-buster-x64']
 imageMap['eu-central-1b.min-jammy-x64']     = imageMap['eu-central-1a.min-jammy-x64']
+imageMap['eu-central-1b.min-noble-x64']     = imageMap['eu-central-1a.min-noble-x64']
 imageMap['eu-central-1b.min-focal-x64']     = imageMap['eu-central-1a.min-focal-x64']
 imageMap['eu-central-1b.min-bionic-x64']    = imageMap['eu-central-1a.min-bionic-x64']
 imageMap['eu-central-1b.min-stretch-x64']   = imageMap['eu-central-1a.min-stretch-x64']
@@ -74,6 +76,7 @@ imageMap['eu-central-1c.fips-centos-7-x64'] = imageMap['eu-central-1a.fips-cento
 imageMap['eu-central-1c.min-centos-6-x64']  = imageMap['eu-central-1a.min-centos-6-x64']
 imageMap['eu-central-1c.min-buster-x64']    = imageMap['eu-central-1a.min-buster-x64']
 imageMap['eu-central-1c.min-jammy-x64']     = imageMap['eu-central-1a.min-jammy-x64']
+imageMap['eu-central-1c.min-noble-x64']     = imageMap['eu-central-1a.min-noble-x64']
 imageMap['eu-central-1c.min-focal-x64']     = imageMap['eu-central-1a.min-focal-x64']
 imageMap['eu-central-1c.min-bionic-x64']    = imageMap['eu-central-1a.min-bionic-x64']
 imageMap['eu-central-1c.min-stretch-x64']   = imageMap['eu-central-1a.min-stretch-x64']
@@ -96,6 +99,7 @@ userMap['docker2']           = userMap['docker']
 userMap['micro-amazon']      = userMap['docker']
 userMap['min-amazon-2-x64']  = userMap['docker']
 userMap['min-jammy-x64']     = 'ubuntu'
+userMap['min-noble-x64']     = 'ubuntu'
 userMap['min-focal-x64']     = 'ubuntu'
 userMap['min-bionic-x64']    = 'ubuntu'
 userMap['min-trusty-x64']    = 'ubuntu'
@@ -290,6 +294,9 @@ initMap['debMap'] = '''
             sudo mount ${DEVICE} /mnt
         fi
     fi
+
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
+
     until sudo apt-get update; do
         sleep 1
         echo try again
@@ -304,11 +311,12 @@ initMap['debMap'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -333,6 +341,7 @@ initMap['min-bookworm-x64'] = initMap['debMap']
 initMap['min-bullseye-x64'] = initMap['debMap']
 initMap['min-buster-x64']   = initMap['debMap']
 initMap['min-jammy-x64']    = initMap['debMap']
+initMap['min-noble-x64']    = initMap['debMap']
 initMap['min-focal-x64']    = initMap['debMap']
 initMap['min-stretch-x64']  = initMap['debMap']
 initMap['min-xenial-x64']   = initMap['debMap']
@@ -355,6 +364,7 @@ typeMap['min-centos-8-x64']  = typeMap['min-centos-7-x64']
 typeMap['min-ol-8-x64']      = typeMap['min-centos-7-x64']
 typeMap['min-ol-9-x64']      = 'i3en.2xlarge'
 typeMap['min-jammy-x64']     = typeMap['min-centos-7-x64']
+typeMap['min-noble-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-focal-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-bionic-x64']    = typeMap['min-centos-7-x64']
 typeMap['min-buster-x64']    = typeMap['min-centos-7-x64']
@@ -373,6 +383,7 @@ execMap['docker2']           = execMap['docker']
 execMap['micro-amazon']      = '30'
 execMap['min-amazon-2-x64']  = '1'
 execMap['min-jammy-x64']     = '1'
+execMap['min-noble-x64']     = '1'
 execMap['min-focal-x64']     = '1'
 execMap['min-bionic-x64']    = '1'
 execMap['min-centos-6-x32']  = '1'
@@ -396,6 +407,7 @@ devMap['micro-amazon']      = devMap['docker']
 devMap['min-amazon-2-x64']  = '/dev/xvda=:30:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['min-bionic-x64']    = '/dev/sda1=:30:true:gp2,/dev/sdd=:80:true:gp2'
 devMap['min-jammy-x64']     = devMap['min-bionic-x64']
+devMap['min-noble-x64']     = devMap['min-bionic-x64']
 devMap['min-focal-x64']     = devMap['min-bionic-x64']
 devMap['min-centos-6-x64']  = devMap['min-bionic-x64']
 devMap['min-centos-7-x64']  = devMap['min-bionic-x64']
@@ -418,6 +430,7 @@ labelMap['micro-amazon']      = 'master'
 labelMap['min-amazon-2-x64']  = ''
 labelMap['min-bionic-x64']    = 'asan'
 labelMap['min-jammy-x64']     = ''
+labelMap['min-noble-x64']     = ''
 labelMap['min-focal-x64']     = ''
 labelMap['min-centos-6-x32']  = ''
 labelMap['min-centos-6-x64']  = ''
@@ -440,6 +453,7 @@ jvmoptsMap['micro-amazon']      = jvmoptsMap['docker']
 jvmoptsMap['min-amazon-2-x64']  = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64']    = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64']     = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-centos-6-x32']  = jvmoptsMap['docker']
 jvmoptsMap['min-centos-6-x64']  = jvmoptsMap['docker']
@@ -533,6 +547,7 @@ String region = 'eu-central-1'
             getTemplate('fips-centos-7-x64',  "${region}${it}"),
             // getTemplate('min-centos-6-x64',   "${region}${it}"),
             getTemplate('min-jammy-x64',      "${region}${it}"),
+            getTemplate('min-noble-x64',      "${region}${it}"),
             getTemplate('min-focal-x64',      "${region}${it}"),
             getTemplate('min-bionic-x64',     "${region}${it}"),
             getTemplate('min-buster-x64',     "${region}${it}"),
diff --git a/IaC/ps80.cd/init.groovy.d/cloud.groovy b/IaC/ps80.cd/init.groovy.d/cloud.groovy
index 02f73c2a51..733ea0448e 100644
--- a/IaC/ps80.cd/init.groovy.d/cloud.groovy
+++ b/IaC/ps80.cd/init.groovy.d/cloud.groovy
@@ -25,6 +25,7 @@ imageMap['us-west-2a.docker']            = 'ami-0f3b366cff2e46862'
 imageMap['us-west-2a.docker-32gb']       = 'ami-0f3b366cff2e46862'
 imageMap['us-west-2a.docker-32gb-hirsute']  = 'ami-0cbdf6c0f39fd3950'
 imageMap['us-west-2a.docker-32gb-jammy']    = 'ami-04aa685cc800320b3'
+imageMap['us-west-2a.docker-32gb-noble']    = 'ami-0cf2b4e024cdb6960'
 imageMap['us-west-2a.docker-32gb-focal']    = 'ami-0ceeab680f529cc36'
 imageMap['us-west-2a.docker-32gb-bullseye'] = 'ami-0c1b4dff690b5d229'
 imageMap['us-west-2a.docker2']           = 'ami-0f3b366cff2e46862'
@@ -38,6 +39,7 @@ imageMap['us-west-2a.fips-centos-7-x64'] = 'ami-036d2cdf95d86d256'
 imageMap['us-west-2a.min-centos-6-x64']  = 'ami-052ff42ae3be02b6a'
 imageMap['us-west-2a.min-buster-x64']    = 'ami-0164ab05efc075cbc'
 imageMap['us-west-2a.min-jammy-x64']     = 'ami-04aa685cc800320b3'
+imageMap['us-west-2a.min-noble-x64']     = 'ami-0cf2b4e024cdb6960'
 imageMap['us-west-2a.min-focal-x64']     = 'ami-0ceeab680f529cc36'
 imageMap['us-west-2a.min-bionic-x64']    = 'ami-0efcd70d6d745b26c'
 imageMap['us-west-2a.min-stretch-x64']   = 'ami-040a022e1b0c8b7f4'
@@ -51,6 +53,7 @@ imageMap['us-west-2b.docker']            = imageMap['us-west-2a.docker']
 imageMap['us-west-2b.docker-32gb']       = imageMap['us-west-2a.docker-32gb']
 imageMap['us-west-2b.docker-32gb-hirsute']  = imageMap['us-west-2a.docker-32gb-hirsute']
 imageMap['us-west-2b.docker-32gb-jammy']    = imageMap['us-west-2a.docker-32gb-jammy']
+imageMap['us-west-2b.docker-32gb-noble']    = imageMap['us-west-2a.docker-32gb-noble']
 imageMap['us-west-2b.docker-32gb-focal']    = imageMap['us-west-2a.docker-32gb-focal']
 imageMap['us-west-2b.docker-32gb-bullseye'] = imageMap['us-west-2a.docker-32gb-bullseye']
 imageMap['us-west-2b.docker2']           = imageMap['us-west-2a.docker2']
@@ -64,6 +67,7 @@ imageMap['us-west-2b.fips-centos-7-x64'] = imageMap['us-west-2a.fips-centos-7-x6
 imageMap['us-west-2b.min-centos-6-x64']  = imageMap['us-west-2a.min-centos-6-x64']
 imageMap['us-west-2b.min-buster-x64']    = imageMap['us-west-2a.min-buster-x64']
 imageMap['us-west-2b.min-jammy-x64' ]    = imageMap['us-west-2a.min-jammy-x64']
+imageMap['us-west-2b.min-noble-x64' ]    = imageMap['us-west-2a.min-noble-x64']
 imageMap['us-west-2b.min-focal-x64' ]    = imageMap['us-west-2a.min-focal-x64']
 imageMap['us-west-2b.min-bionic-x64']    = imageMap['us-west-2a.min-bionic-x64']
 imageMap['us-west-2b.min-stretch-x64']   = imageMap['us-west-2a.min-stretch-x64']
@@ -77,6 +81,7 @@ imageMap['us-west-2c.docker']            = imageMap['us-west-2a.docker']
 imageMap['us-west-2c.docker-32gb']       = imageMap['us-west-2a.docker-32gb']
 imageMap['us-west-2c.docker-32gb-hirsute']  = imageMap['us-west-2a.docker-32gb-hirsute']
 imageMap['us-west-2c.docker-32gb-jammy']    = imageMap['us-west-2a.docker-32gb-jammy']
+imageMap['us-west-2c.docker-32gb-noble']    = imageMap['us-west-2a.docker-32gb-noble']
 imageMap['us-west-2c.docker-32gb-focal']    = imageMap['us-west-2a.docker-32gb-focal']
 imageMap['us-west-2c.docker-32gb-bullseye'] = imageMap['us-west-2a.docker-32gb-bullseye']
 imageMap['us-west-2c.docker2']           = imageMap['us-west-2a.docker2']
@@ -90,6 +95,7 @@ imageMap['us-west-2c.fips-centos-7-x64'] = imageMap['us-west-2a.fips-centos-7-x6
 imageMap['us-west-2c.min-centos-6-x64']  = imageMap['us-west-2a.min-centos-6-x64']
 imageMap['us-west-2c.min-buster-x64']    = imageMap['us-west-2a.min-buster-x64']
 imageMap['us-west-2c.min-jammy-x64' ]    = imageMap['us-west-2a.min-jammy-x64']
+imageMap['us-west-2c.min-noble-x64' ]    = imageMap['us-west-2a.min-noble-x64']
 imageMap['us-west-2c.min-focal-x64' ]    = imageMap['us-west-2a.min-focal-x64']
 imageMap['us-west-2c.min-bionic-x64']    = imageMap['us-west-2a.min-bionic-x64']
 imageMap['us-west-2c.min-stretch-x64']   = imageMap['us-west-2a.min-stretch-x64']
@@ -103,6 +109,7 @@ imageMap['us-west-2d.docker']            = imageMap['us-west-2a.docker']
 imageMap['us-west-2d.docker-32gb']       = imageMap['us-west-2a.docker-32gb']
 imageMap['us-west-2d.docker-32gb-hirsute']  = imageMap['us-west-2a.docker-32gb-hirsute']
 imageMap['us-west-2d.docker-32gb-jammy']    = imageMap['us-west-2a.docker-32gb-jammy']
+imageMap['us-west-2d.docker-32gb-noble']    = imageMap['us-west-2a.docker-32gb-noble']
 imageMap['us-west-2d.docker-32gb-focal']    = imageMap['us-west-2a.docker-32gb-focal']
 imageMap['us-west-2d.docker-32gb-bullseye'] = imageMap['us-west-2a.docker-32gb-bullseye']
 imageMap['us-west-2d.docker2']           = imageMap['us-west-2a.docker2']
@@ -116,6 +123,7 @@ imageMap['us-west-2d.fips-centos-7-x64'] = imageMap['us-west-2a.fips-centos-7-x6
 imageMap['us-west-2d.min-centos-6-x64']  = imageMap['us-west-2a.min-centos-6-x64']
 imageMap['us-west-2d.min-buster-x64']    = imageMap['us-west-2a.min-buster-x64']
 imageMap['us-west-2d.min-jammy-x64' ]    = imageMap['us-west-2a.min-jammy-x64']
+imageMap['us-west-2d.min-noble-x64' ]    = imageMap['us-west-2a.min-noble-x64']
 imageMap['us-west-2d.min-focal-x64' ]    = imageMap['us-west-2a.min-focal-x64']
 imageMap['us-west-2d.min-bionic-x64']    = imageMap['us-west-2a.min-bionic-x64']
 imageMap['us-west-2d.min-stretch-x64']   = imageMap['us-west-2a.min-stretch-x64']
@@ -129,7 +137,7 @@ priceMap = [:]
 priceMap['t2.medium'] = '0.07'   // type=t2.medium, vCPU=2, memory=4GiB, saving=69%, interruption='<5%', price=0.032000
 priceMap['c5.4xlarge'] = '0.35'  // type=c5.4xlarge, vCPU=16, memory=32GiB, saving=62%, interruption='<5%', price=0.272000
 priceMap['r5a.4xlarge'] = '0.65' // type=r5a.4xlarge, vCPU=16, memory=128GiB, saving=67%, interruption='<5%', price=0.583900
-priceMap['m5d.2xlarge'] = '0.37' // type=m5d.2xlarge, vCPU=8, memory=32GiB, saving=64%, interruption='<5%', price=0.201900
+priceMap['m5dn.2xlarge'] = '0.37' // type=m5dn.2xlarge, vCPU=8, memory=32GiB, saving=64%, interruption='<5%', price=0.201900
 
 priceMap['r6gd.2xlarge'] = '0.34'
 
@@ -138,12 +146,14 @@ userMap['docker']            = 'ec2-user'
 userMap['docker-32gb']       = userMap['docker']
 userMap['docker-32gb-hirsute']  = 'ubuntu'
 userMap['docker-32gb-jammy']    = 'ubuntu'
+userMap['docker-32gb-noble']    = 'ubuntu'
 userMap['docker-32gb-focal']    = 'ubuntu'
 userMap['docker-32gb-bullseye'] = 'admin' // userMap['min-bullseye-x64']
 userMap['docker2']           = userMap['docker']
 userMap['micro-amazon']      = userMap['docker']
 userMap['min-amazon-2-x64']  = userMap['docker']
 userMap['min-jammy-x64']     = 'ubuntu'
+userMap['min-noble-x64']     = 'ubuntu'
 userMap['min-focal-x64']     = 'ubuntu'
 userMap['min-bionic-x64']    = 'ubuntu'
 userMap['min-xenial-x64']    = 'ubuntu'
@@ -167,12 +177,14 @@ modeMap['docker']            = 'Node.Mode.NORMAL'
 modeMap['docker-32gb']       = modeMap['docker']
 modeMap['docker-32gb-hirsute']  = modeMap['docker']
 modeMap['docker-32gb-jammy']    = modeMap['docker']
+modeMap['docker-32gb-noble']    = modeMap['docker']
 modeMap['docker-32gb-focal']    = modeMap['docker']
 modeMap['docker-32gb-bullseye'] = modeMap['docker']
 modeMap['docker2']           = modeMap['docker']
 modeMap['micro-amazon']      = modeMap['docker']
 modeMap['min-amazon-2-x64']  = modeMap['docker']
 modeMap['min-jammy-x64']     = 'Node.Mode.EXCLUSIVE'
+modeMap['min-noble-x64']     = 'Node.Mode.EXCLUSIVE'
 modeMap['min-focal-x64']     = 'Node.Mode.EXCLUSIVE'
 modeMap['min-bionic-x64']    = modeMap['min-focal-x64']
 modeMap['min-xenial-x64']    = modeMap['min-focal-x64']
@@ -319,6 +331,7 @@ initMap['docker-32gb-hirsute'] = '''
     echo "* * * * * root /usr/sbin/route add default gw 10.177.1.1 eth0" | sudo tee /etc/cron.d/fix-default-route
 '''
 initMap['docker-32gb-jammy'] = initMap['docker-32gb-hirsute']
+initMap['docker-32gb-noble'] = initMap['docker-32gb-hirsute']
 initMap['docker-32gb-focal'] = initMap['docker-32gb-hirsute']
 initMap['docker-32gb-bullseye'] = '''
     set -o xtrace
@@ -498,6 +511,9 @@ initMap['min-buster-x64'] = '''
             sudo mount ${DEVICE} /mnt
         fi
     fi
+
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
+
     until sudo DEBIAN_FRONTEND=noninteractive apt-get update; do
         sleep 1
         echo try again
@@ -512,17 +528,19 @@ initMap['min-buster-x64'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
     sudo install -o $(id -u -n) -g $(id -g -n) -d /mnt/jenkins
 '''
 initMap['min-jammy-x64'] = initMap['min-bionic-x64']
+initMap['min-noble-x64'] = initMap['min-bionic-x64']
 initMap['min-focal-x64'] = initMap['min-bionic-x64']
 initMap['min-stretch-x64'] = initMap['min-bionic-x64']
 initMap['min-xenial-x64'] = initMap['min-bionic-x64']
@@ -534,15 +552,16 @@ initMap['docker-32gb-aarch64'] = initMap['docker']
 capMap = [:]
 capMap['c5.4xlarge'] = '80'
 capMap['r5a.4xlarge'] = '60'
-capMap['m5d.2xlarge'] = '60'
+capMap['m5dn.2xlarge'] = '60'
 capMap['r6gd.2xlarge'] = '40'
 
 typeMap = [:]
 typeMap['micro-amazon']      = 't2.medium'
-typeMap['docker']            = 'm5d.2xlarge'
+typeMap['docker']            = 'm5dn.2xlarge'
 typeMap['docker-32gb']       = 'c5.4xlarge'
 typeMap['docker-32gb-hirsute']  = 'r5a.4xlarge'
 typeMap['docker-32gb-jammy']    = 'r5a.4xlarge'
+typeMap['docker-32gb-noble']    = 'r5a.4xlarge'
 typeMap['docker-32gb-focal']    = 'r5a.4xlarge'
 typeMap['docker-32gb-bullseye'] = 'r5a.4xlarge'
 typeMap['docker2']           = 'r5a.4xlarge'
@@ -552,10 +571,11 @@ typeMap['min-ol-8-x64']      = typeMap['docker']
 typeMap['min-ol-9-x64']      = typeMap['docker']
 typeMap['fips-centos-7-x64'] = typeMap['docker-32gb']
 typeMap['min-jammy-x64']     = 'r5a.4xlarge'
+typeMap['min-noble-x64']     = 'r5a.4xlarge'
 typeMap['min-focal-x64']     = typeMap['docker']
 typeMap['min-bionic-x64']    = typeMap['min-centos-7-x64']
 typeMap['min-buster-x64']    = typeMap['min-centos-7-x64']
-typeMap['min-centos-6-x64']  = 'm5d.2xlarge'
+typeMap['min-centos-6-x64']  = 'm5dn.2xlarge'
 typeMap['min-stretch-x64']   = typeMap['docker']
 typeMap['min-xenial-x64']    = typeMap['docker']
 typeMap['min-amazon-2-x64']  = typeMap['docker']
@@ -569,6 +589,7 @@ execMap['docker']            = '1'
 execMap['docker-32gb']       = execMap['docker']
 execMap['docker-32gb-hirsute']  = execMap['docker']
 execMap['docker-32gb-jammy']    = execMap['docker']
+execMap['docker-32gb-noble']    = execMap['docker']
 execMap['docker-32gb-focal']    = execMap['docker']
 execMap['docker-32gb-bullseye'] = execMap['docker']
 execMap['docker2']           = execMap['docker']
@@ -577,6 +598,7 @@ execMap['min-amazon-2-x64']  = '1'
 execMap['min-bionic-x64']    = '1'
 execMap['min-focal-x64']     = '1'
 execMap['min-jammy-x64']     = '1'
+execMap['min-noble-x64']     = '1'
 execMap['min-centos-6-x64']  = '1'
 execMap['min-centos-7-x64']  = '1'
 execMap['fips-centos-7-x64'] = '1'
@@ -597,6 +619,7 @@ devMap['docker2']           = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
 devMap['docker-32gb']       = devMap['docker']
 devMap['docker-32gb-hirsute']  = devMap['docker']
 devMap['docker-32gb-jammy']    = devMap['docker']
+devMap['docker-32gb-noble']    = devMap['docker']
 devMap['docker-32gb-focal']    = devMap['docker']
 devMap['docker-32gb-bullseye'] = devMap['docker']
 devMap['micro-amazon']      = '/dev/xvda=:30:true:gp2,/dev/xvdd=:80:true:gp2'
@@ -604,6 +627,7 @@ devMap['min-amazon-2-x64']  = '/dev/xvda=:30:true:gp2,/dev/xvdd=:120:true:gp2'
 devMap['min-bionic-x64']    = '/dev/sda1=:30:true:gp2,/dev/sdd=:120:true:gp2'
 devMap['min-focal-x64']     = devMap['min-bionic-x64']
 devMap['min-jammy-x64']     = devMap['min-bionic-x64']
+devMap['min-noble-x64']     = devMap['min-bionic-x64']
 devMap['min-centos-6-x64']  = devMap['min-bionic-x64']
 devMap['min-centos-7-x64']  = devMap['min-bionic-x64']
 devMap['fips-centos-7-x64'] = devMap['min-bionic-x64']
@@ -623,6 +647,7 @@ labelMap['docker']            = ''
 labelMap['docker-32gb']       = ''
 labelMap['docker-32gb-hirsute']  = ''
 labelMap['docker-32gb-jammy']    = ''
+labelMap['docker-32gb-noble']    = ''
 labelMap['docker-32gb-focal']    = ''
 labelMap['docker-32gb-bullseye'] = ''
 labelMap['docker2']           = ''
@@ -631,6 +656,7 @@ labelMap['min-amazon-2-x64']  = ''
 labelMap['min-bionic-x64']    = 'asan'
 labelMap['min-focal-x64']     = ''
 labelMap['min-jammy-x64']     = ''
+labelMap['min-noble-x64']     = ''
 labelMap['min-centos-6-x64']  = ''
 labelMap['min-centos-7-x64']  = ''
 labelMap['fips-centos-7-x64'] = ''
@@ -650,6 +676,7 @@ jvmoptsMap['docker']            = '-Xmx512m -Xms512m'
 jvmoptsMap['docker-32gb']       = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-hirsute']  = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-jammy']    = jvmoptsMap['docker']
+jvmoptsMap['docker-32gb-noble']    = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-focal']    = jvmoptsMap['docker']
 jvmoptsMap['docker-32gb-bullseye'] = jvmoptsMap['docker']
 jvmoptsMap['docker2']           = jvmoptsMap['docker']
@@ -658,6 +685,7 @@ jvmoptsMap['min-amazon-2-x64']  = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64']    = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64']     = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-centos-6-x64']  = jvmoptsMap['docker']
 jvmoptsMap['min-centos-7-x64']  = jvmoptsMap['docker']
 jvmoptsMap['fips-centos-7-x64'] = jvmoptsMap['docker']
@@ -744,6 +772,7 @@ String region = 'us-west-2'
             getTemplate('docker-32gb',          "${region}${it}"),
             getTemplate('docker-32gb-hirsute',  "${region}${it}"),
             getTemplate('docker-32gb-jammy',    "${region}${it}"),
+            getTemplate('docker-32gb-noble',    "${region}${it}"),
             getTemplate('docker-32gb-focal',    "${region}${it}"),
             getTemplate('docker-32gb-bullseye', "${region}${it}"),
             getTemplate('micro-amazon',         "${region}${it}"),
@@ -757,6 +786,7 @@ String region = 'us-west-2'
             getTemplate('min-bionic-x64',       "${region}${it}"),
             getTemplate('min-focal-x64',        "${region}${it}"),
             getTemplate('min-jammy-x64',        "${region}${it}"),
+            getTemplate('min-noble-x64',        "${region}${it}"),
             getTemplate('min-buster-x64',       "${region}${it}"),
             getTemplate('min-stretch-x64',      "${region}${it}"),
             getTemplate('min-xenial-x64',       "${region}${it}"),
diff --git a/IaC/psmdb.cd/init.groovy.d/cloud.groovy b/IaC/psmdb.cd/init.groovy.d/cloud.groovy
index 55b2f92d39..9d2c6adf96 100644
--- a/IaC/psmdb.cd/init.groovy.d/cloud.groovy
+++ b/IaC/psmdb.cd/init.groovy.d/cloud.groovy
@@ -35,6 +35,7 @@ imageMap['min-xenial-x64']   = 'ami-079e7a3f57cc8e0d0'
 imageMap['min-bionic-x64']   = 'ami-093407aedabc3d647'
 imageMap['min-focal-x64']    = 'ami-0ee3d9a8776e8b99c'
 imageMap['min-jammy-x64']    = 'ami-0aa5fa88fa2ec19dc'
+imageMap['min-noble-x64']    = 'ami-0cf2b4e024cdb6960'
 imageMap['psmdb']            = imageMap['min-xenial-x64']
 imageMap['psmdb-bionic']     = imageMap['min-bionic-x64']
 imageMap['docker']           = imageMap['micro-amazon']
@@ -44,11 +45,11 @@ imageMap['docker-64gb']      = imageMap['micro-amazon']
 imageMap['docker-64gb-aarch64'] = 'ami-055495e6fc65e4321'
 
 priceMap = [:]
-priceMap['c5.large']   = '0.13' // type=c5.large, vCPU=2, memory=4GiB, saving=29%, interruption='<5%', price=0.071400
-priceMap['c5ad.2xlarge']  = '0.33'
-priceMap['c5.4xlarge'] = '0.33' // type=c5.4xlarge, vCPU=16, memory=32GiB, saving=62%, interruption='<5%', price=0.260400
-priceMap['i4i.4xlarge'] = '0.72' // type=i4i.4xlarge, vCPU=16, memory=64GiB, saving=70%, interruption='<5%'
-priceMap['m6g.4xlarge'] = '0.57' // aarch64 type=m6g.4xlarge, vCPU=16, memory=64GiB, saving=38%, interruption='<5%', price=0.488500
+priceMap['c5.xlarge']   = '0.13' // type=c5.xlarge, vCPU=2, memory=4GiB, saving=29%, interruption='<5%', price=0.071400
+priceMap['c5a.2xlarge']  = '0.25'  //type=c5a.2xlarge, vCPU=8, memory=16GiB, saving=58%, interruption='<5%', price=0.182000
+priceMap['g4ad.2xlarge'] = '0.33' //type=g4ad.2xlarge, vCPU=8, memory=32GiB, saving=63%, interruption='<5%', price=0.20
+priceMap['i3en.3xlarge'] = '0.72' // type=i3en.3xlarge, vCPU=16, memory=64GiB, saving=70%, interruption='<5%'
+priceMap['i4g.4xlarge'] = '0.57' // aarch64 type=i4g.4xlarge, vCPU=16, memory=64GiB, saving=38%, interruption='<5%', price=0.488500
 
 userMap = [:]
 userMap['docker']           = 'ec2-user'
@@ -65,6 +66,7 @@ userMap['min-xenial-x64']   = 'ubuntu'
 userMap['min-bionic-x64']   = 'ubuntu'
 userMap['min-focal-x64']    = 'ubuntu'
 userMap['min-jammy-x64']    = 'ubuntu'
+userMap['min-noble-x64']    = 'ubuntu'
 userMap['min-bullseye-x64'] = 'admin'
 userMap['min-bookworm-x64'] = 'admin'
 userMap['psmdb']            = userMap['min-xenial-x64']
@@ -230,6 +232,8 @@ initMap['debMap'] = '''
 
     echo '10.30.6.9 repo.ci.percona.com' | sudo tee -a /etc/hosts
 
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
+
     until sudo DEBIAN_FRONTEND=noninteractive apt-get update; do
         sleep 1
         echo try again
@@ -244,11 +248,12 @@ initMap['debMap'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -269,6 +274,7 @@ initMap['min-stretch-x64']  = initMap['debMap']
 initMap['min-buster-x64']   = initMap['debMap']
 
 initMap['min-jammy-x64']   = initMap['debMap']
+initMap['min-noble-x64']   = initMap['debMap']
 initMap['min-focal-x64']   = initMap['debMap']
 initMap['min-bionic-x64']  = initMap['debMap']
 initMap['min-xenial-x64']  = initMap['debMap']
@@ -278,16 +284,16 @@ initMap['psmdb-bionic']    = initMap['debMap']
 initMap['docker-64gb-aarch64'] = initMap['docker-32gb']
 
 capMap = [:]
-capMap['c5ad.2xlarge'] = '60'
-capMap['c5.4xlarge'] = '80'
-capMap['i4i.4xlarge'] = '20'
-capMap['m6g.4xlarge'] = '20'
+capMap['c5a.2xlarge'] = '60'
+capMap['g4ad.2xlarge'] = '80'
+capMap['i3en.3xlarge'] = '30'
+capMap['i4g.4xlarge'] = '20'
 
 typeMap = [:]
-typeMap['micro-amazon']      = 'c5.large'
-typeMap['docker']            = 'c5ad.2xlarge'
-typeMap['docker-32gb']       = 'c5.4xlarge'
-typeMap['docker-64gb']       = 'i4i.4xlarge'
+typeMap['micro-amazon']      = 'c5.xlarge'
+typeMap['docker']            = 'c5a.2xlarge'
+typeMap['docker-32gb']       = 'g4ad.2xlarge'
+typeMap['docker-64gb']       = 'i3en.3xlarge'
 typeMap['min-centos-7-x64']  = typeMap['docker-32gb']
 typeMap['min-centos-8-x64']  = typeMap['docker-32gb']
 typeMap['min-ol-8-x64']      = typeMap['docker-32gb']
@@ -300,10 +306,11 @@ typeMap['min-xenial-x64']    = typeMap['docker-32gb']
 typeMap['min-bionic-x64']    = typeMap['docker-32gb']
 typeMap['min-focal-x64']     = typeMap['docker-32gb']
 typeMap['min-jammy-x64']     = typeMap['docker-32gb']
+typeMap['min-noble-x64']     = typeMap['docker-32gb']
 typeMap['psmdb']             = typeMap['docker-32gb']
 typeMap['psmdb-bionic']      = typeMap['docker-32gb']
 
-typeMap['docker-64gb-aarch64'] = 'm6g.4xlarge'
+typeMap['docker-64gb-aarch64'] = 'i4g.4xlarge'
 
 execMap = [:]
 execMap['docker']           = '1'
@@ -322,6 +329,7 @@ execMap['min-xenial-x64']   = '1'
 execMap['min-bionic-x64']   = '1'
 execMap['min-focal-x64']    = '1'
 execMap['min-jammy-x64']    = '1'
+execMap['min-noble-x64']    = '1'
 execMap['psmdb']            = '1'
 execMap['psmdb-bionic']     = '1'
 
@@ -346,6 +354,7 @@ devMap['min-xenial-x64']   = '/dev/sda1=:8:true:gp2,/dev/sdd=:500:true:gp2'
 devMap['min-bionic-x64']   = '/dev/sda1=:8:true:gp2,/dev/sdd=:500:true:gp2'
 devMap['min-focal-x64']    = '/dev/sda1=:8:true:gp2,/dev/sdd=:500:true:gp2'
 devMap['min-jammy-x64']    = '/dev/sda1=:8:true:gp2,/dev/sdd=:500:true:gp2'
+devMap['min-noble-x64']    = '/dev/sda1=:8:true:gp2,/dev/sdd=:500:true:gp2'
 
 devMap['docker-64gb-aarch64'] = devMap['docker']
 
@@ -366,6 +375,7 @@ labelMap['min-xenial-x64']   = ''
 labelMap['min-bionic-x64']   = ''
 labelMap['min-focal-x64']    = ''
 labelMap['min-jammy-x64']    = ''
+labelMap['min-noble-x64']    = ''
 labelMap['psmdb']            = ''
 labelMap['psmdb-bionic']     = ''
 
@@ -388,6 +398,7 @@ jvmoptsMap['min-xenial-x64']   = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64']   = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64']    = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64']    = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64']    = jvmoptsMap['docker']
 jvmoptsMap['psmdb']            = jvmoptsMap['docker']
 jvmoptsMap['psmdb-bionic']     = jvmoptsMap['docker']
 
@@ -475,6 +486,7 @@ String region = 'us-west-2'
             getTemplate('min-bullseye-x64', "${region}${it}"),
             getTemplate('min-bookworm-x64', "${region}${it}"),
             getTemplate('min-jammy-x64',    "${region}${it}"),
+            getTemplate('min-noble-x64',    "${region}${it}"),
             getTemplate('min-focal-x64',    "${region}${it}"),
             getTemplate('min-bionic-x64',   "${region}${it}"),
             getTemplate('min-xenial-x64',   "${region}${it}"),
diff --git a/IaC/pxb.cd/init.groovy.d/cloud.groovy b/IaC/pxb.cd/init.groovy.d/cloud.groovy
index e77ee504fb..a427b66e97 100644
--- a/IaC/pxb.cd/init.groovy.d/cloud.groovy
+++ b/IaC/pxb.cd/init.groovy.d/cloud.groovy
@@ -33,13 +33,14 @@ imageMap['min-bionic-x64']   = 'ami-0bdef2eb518663879'
 imageMap['min-buster-x64']   = 'ami-090cd3aed687b1ee1'
 imageMap['min-focal-x64']    = 'ami-01773ce53581acf22'
 imageMap['min-jammy-x64']    = 'ami-0ee8244746ec5d6d4'
+imageMap['min-noble-x64']    = 'ami-0cf2b4e024cdb6960'
 imageMap['min-bullseye-x64'] = 'ami-0d0f7602aa5c2425d'
 imageMap['min-bookworm-x64'] = 'ami-0544719b13af6edc3'
 
 priceMap = [:]
 priceMap['c5a.large'] = '0.08'    // type=c5a.large, vCPU=2, memory=4GiB, saving=55%, interruption='<5%', price=0.043400
 priceMap['m5n.2xlarge'] = '0.32'  // type=m5n.2xlarge, vCPU=8, memory=32GiB, saving=48%, interruption='<5%', price=0.253000
-priceMap['m5n.4xlarge'] = '0.62'  // type=m5n.4xlarge, vCPU=16, memory=64GiB, saving=48%, interruption='<5%', price=0.512200
+priceMap['i4i.4xlarge'] = '0.62'  // type=i4i.4xlarge, vCPU=16, memory=64GiB, saving=48%, interruption='<5%', price=0.512200
 
 userMap = [:]
 userMap['docker'] = 'ec2-user'
@@ -54,6 +55,7 @@ userMap['min-ol-9-x64'] = 'ec2-user'
 userMap['min-buster-x64'] = 'admin'
 userMap['min-focal-x64'] = 'ubuntu'
 userMap['min-jammy-x64'] = 'ubuntu'
+userMap['min-noble-x64'] = 'ubuntu'
 userMap['min-bullseye-x64'] = 'admin'
 userMap['min-bookworm-x64'] = 'admin'
 
@@ -195,6 +197,9 @@ initMap['debMap'] = '''
             sudo mount ${DEVICE} /mnt
         fi
     fi
+
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
+
     until sudo DEBIAN_FRONTEND=noninteractive apt-get update; do
         sleep 1
         echo try again
@@ -209,11 +214,12 @@ initMap['debMap'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+	sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -234,17 +240,18 @@ initMap['min-bookworm-x64'] = initMap['debMap']
 initMap['min-bionic-x64'] = initMap['debMap']
 initMap['min-focal-x64']  = initMap['debMap']
 initMap['min-jammy-x64']  = initMap['debMap']
+initMap['min-noble-x64']  = initMap['debMap']
 
 
 capMap = [:]
 capMap['m5n.2xlarge'] = '120'
-capMap['m5n.4xlarge'] = '80'
+capMap['i4i.4xlarge'] = '80'
 capMap['c5a.large'] = '15'
 
 typeMap = [:]
 typeMap['micro-amazon'] = 'c5a.large'
 typeMap['docker'] = 'm5n.2xlarge'
-typeMap['docker-32gb'] = 'm5n.4xlarge'
+typeMap['docker-32gb'] = 'i4i.4xlarge'
 typeMap['min-centos-7-x64'] = typeMap['docker']
 typeMap['fips-centos-7-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-centos-8-x64'] = typeMap['min-centos-7-x64']
@@ -253,6 +260,7 @@ typeMap['min-ol-9-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-bionic-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-focal-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-jammy-x64'] = typeMap['min-centos-7-x64']
+typeMap['min-noble-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-buster-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-bullseye-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-bookworm-x64'] = typeMap['min-centos-7-x64']
@@ -270,6 +278,7 @@ execMap['min-ol-9-x64'] = '1'
 execMap['min-buster-x64'] = '1'
 execMap['min-focal-x64'] = '1'
 execMap['min-jammy-x64'] = '1'
+execMap['min-noble-x64'] = '1'
 execMap['min-bullseye-x64'] = '1'
 execMap['min-bookworm-x64'] = '1'
 
@@ -280,6 +289,7 @@ devMap['micro-amazon'] = devMap['docker']
 devMap['min-bionic-x64'] = '/dev/sda1=:30:true:gp2,/dev/sdd=:80:true:gp2'
 devMap['min-focal-x64'] = devMap['min-bionic-x64']
 devMap['min-jammy-x64'] = devMap['min-bionic-x64']
+devMap['min-noble-x64'] = devMap['min-bionic-x64']
 devMap['min-centos-7-x64'] = devMap['min-bionic-x64']
 devMap['fips-centos-7-x64'] = devMap['min-bionic-x64']
 devMap['min-centos-8-x64'] = '/dev/sda1=:30:true:gp2,/dev/sdd=:80:true:gp2'
@@ -296,6 +306,7 @@ labelMap['micro-amazon'] = 'master'
 labelMap['min-bionic-x64'] = 'asan'
 labelMap['min-focal-x64'] = ''
 labelMap['min-jammy-x64'] = ''
+labelMap['min-noble-x64'] = ''
 labelMap['min-centos-7-x64'] = ''
 labelMap['fips-centos-7-x64'] = ''
 labelMap['min-centos-8-x64'] = ''
@@ -312,6 +323,7 @@ jvmoptsMap['micro-amazon'] = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64'] = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64'] = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64'] = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64'] = jvmoptsMap['docker']
 jvmoptsMap['min-centos-7-x64'] = jvmoptsMap['docker']
 jvmoptsMap['fips-centos-7-x64'] = jvmoptsMap['docker']
 jvmoptsMap['min-centos-8-x64'] = jvmoptsMap['docker']
@@ -400,6 +412,7 @@ String region = 'us-west-2'
             getTemplate('min-bionic-x64', "${region}${it}"),
             getTemplate('min-focal-x64', "${region}${it}"),
             getTemplate('min-jammy-x64', "${region}${it}"),
+            getTemplate('min-noble-x64', "${region}${it}"),
             getTemplate('min-bullseye-x64', "${region}${it}"),
             getTemplate('min-bookworm-x64', "${region}${it}"),
         ],                                       // List<? extends SlaveTemplate> templates
diff --git a/IaC/pxc.cd/init.groovy.d/cloud.groovy b/IaC/pxc.cd/init.groovy.d/cloud.groovy
index 04605f25ac..f163b60286 100644
--- a/IaC/pxc.cd/init.groovy.d/cloud.groovy
+++ b/IaC/pxc.cd/init.groovy.d/cloud.groovy
@@ -27,6 +27,7 @@ imageMap['micro-amazon']     = 'ami-098023750985977ad'
 imageMap['min-bionic-x64']   = 'ami-0a0da33f8cf70309a'
 imageMap['min-focal-x64']    = 'ami-081a3b9eded47f0f3'
 imageMap['min-jammy-x64']    = 'ami-014d05e6b24240371'
+imageMap['min-noble-x64']    = 'ami-08012c0a9ee8e21c4'
 imageMap['min-centos-6-x32'] = 'ami-67e3cd22'
 imageMap['min-centos-6-x64'] = 'ami-0d282a216ae4c0c42'
 imageMap['min-centos-7-x64'] = 'ami-08d2d8b00f270d03b'
@@ -51,6 +52,7 @@ imageMap['ramdisk-xenial-x64']   = imageMap['min-xenial-x64']
 imageMap['ramdisk-bionic-x64']   = imageMap['min-bionic-x64']
 imageMap['ramdisk-focal-x64']    = imageMap['min-focal-x64']
 imageMap['ramdisk-jammy-x64']    = imageMap['min-jammy-x64']
+imageMap['ramdisk-noble-x64']    = imageMap['min-noble-x64']
 imageMap['ramdisk-buster-x64']   = imageMap['min-buster-x64']
 imageMap['ramdisk-bullseye-x64'] = imageMap['min-bullseye-x64']
 imageMap['ramdisk-bookworm-x64'] = imageMap['min-bookworm-x64']
@@ -71,6 +73,7 @@ userMap['micro-amazon']      = userMap['docker']
 userMap['min-bionic-x64']    = 'ubuntu'
 userMap['min-focal-x64']     = 'ubuntu'
 userMap['min-jammy-x64']     = 'ubuntu'
+userMap['min-noble-x64']     = 'ubuntu'
 userMap['min-centos-6-x32']  = 'root'
 userMap['min-centos-6-x64']  = 'centos'
 userMap['min-centos-7-x64']  = 'centos'
@@ -94,6 +97,7 @@ userMap['ramdisk-xenial-x64']   = userMap['min-xenial-x64']
 userMap['ramdisk-bionic-x64']   = userMap['min-bionic-x64']
 userMap['ramdisk-focal-x64']    = userMap['min-focal-x64']
 userMap['ramdisk-jammy-x64']    = userMap['min-jammy-x64']
+userMap['ramdisk-noble-x64']    = userMap['min-noble-x64']
 userMap['ramdisk-buster-x64']   = userMap['min-buster-x64']
 userMap['ramdisk-bullseye-x64'] = userMap['min-bullseye-x64']
 userMap['ramdisk-bookworm-x64'] = userMap['min-bookworm-x64']
@@ -304,6 +308,7 @@ initMap['debMap'] = '''
             sudo mount ${DEVICE} /mnt
         fi
     fi
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
     until sudo DEBIAN_FRONTEND=noninteractive apt-get update; do
         sleep 1
         echo try again
@@ -318,11 +323,12 @@ initMap['debMap'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -334,6 +340,7 @@ initMap['debMapRamdisk'] = '''
     if ! mountpoint -q /mnt; then
         sudo mount -t tmpfs -o size=20G tmpfs /mnt
     fi
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
     until sudo DEBIAN_FRONTEND=noninteractive apt-get update; do
         sleep 1
         echo try again
@@ -348,11 +355,12 @@ initMap['debMapRamdisk'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -374,6 +382,7 @@ initMap['min-bullseye-x64'] = initMap['debMap']
 initMap['min-bookworm-x64'] = initMap['debMap']
 initMap['min-focal-x64']    = initMap['debMap']
 initMap['min-jammy-x64']    = initMap['debMap']
+initMap['min-noble-x64']    = initMap['debMap']
 initMap['min-stretch-x64']  = initMap['debMap']
 initMap['min-xenial-x64']   = initMap['debMap']
 
@@ -386,6 +395,7 @@ initMap['ramdisk-buster-x64']   = initMap['debMapRamdisk']
 initMap['ramdisk-bionic-x64']   = initMap['debMapRamdisk']
 initMap['ramdisk-focal-x64']    = initMap['debMapRamdisk']
 initMap['ramdisk-jammy-x64']    = initMap['debMapRamdisk']
+initMap['ramdisk-noble-x64']    = initMap['debMapRamdisk']
 initMap['ramdisk-stretch-x64']  = initMap['debMapRamdisk']
 initMap['ramdisk-xenial-x64']   = initMap['debMapRamdisk']
 initMap['ramdisk-bullseye-x64'] = initMap['debMapRamdisk']
@@ -440,6 +450,7 @@ typeMap['fips-centos-7-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-bionic-x64']    = typeMap['min-centos-7-x64']
 typeMap['min-focal-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-jammy-x64']     = typeMap['min-centos-7-x64']
+typeMap['min-noble-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-centos-6-x32']  = 'm1.medium'
 typeMap['min-centos-6-x64']  = 'r3.2xlarge'
 typeMap['min-buster-x64']    = typeMap['min-centos-7-x64']
@@ -458,6 +469,7 @@ typeMap['ramdisk-xenial-x64']   = typeMap['docker-32gb']
 typeMap['ramdisk-bionic-x64']   = typeMap['docker-32gb']
 typeMap['ramdisk-focal-x64']    = typeMap['docker-32gb']
 typeMap['ramdisk-jammy-x64']    = typeMap['docker-32gb']
+typeMap['ramdisk-noble-x64']    = typeMap['docker-32gb']
 typeMap['ramdisk-buster-x64']   = typeMap['docker-32gb']
 typeMap['ramdisk-bullseye-x64'] = typeMap['docker-32gb']
 typeMap['ramdisk-bookworm-x64'] = typeMap['docker-32gb']
@@ -469,6 +481,7 @@ execMap['micro-amazon'] = '30'
 execMap['min-bionic-x64'] = '1'
 execMap['min-focal-x64']  = '1'
 execMap['min-jammy-x64']  = '1'
+execMap['min-noble-x64']  = '1'
 execMap['min-centos-6-x32'] = '1'
 execMap['min-centos-6-x64'] = '1'
 execMap['min-centos-7-x64'] = '1'
@@ -492,6 +505,7 @@ execMap['ramdisk-xenial-x64']   = execMap['docker-32gb']
 execMap['ramdisk-bionic-x64']   = execMap['docker-32gb']
 execMap['ramdisk-focal-x64']    = execMap['docker-32gb']
 execMap['ramdisk-jammy-x64']    = execMap['docker-32gb']
+execMap['ramdisk-noble-x64']    = execMap['docker-32gb']
 execMap['ramdisk-buster-x64']   = execMap['docker-32gb']
 execMap['ramdisk-bullseye-x64'] = execMap['docker-32gb']
 execMap['ramdisk-bookworm-x64'] = execMap['docker-32gb']
@@ -505,6 +519,7 @@ devMap['micro-amazon']      = devMap['docker']
 devMap['min-bionic-x64']    = '/dev/sda1=:8:true:gp2,/dev/sdd=:80:true:gp2'
 devMap['min-focal-x64']     = devMap['min-bionic-x64']
 devMap['min-jammy-x64']     = devMap['min-bionic-x64']
+devMap['min-noble-x64']     = devMap['min-bionic-x64']
 devMap['min-centos-6-x64']  = devMap['min-bionic-x64']
 devMap['min-centos-7-x64']  = devMap['min-bionic-x64']
 devMap['min-centos-8-x64']  = '/dev/sda1=:10:true:gp2,/dev/sdd=:80:true:gp2'
@@ -526,6 +541,7 @@ devMap['ramdisk-ol-9-x64']     = '/dev/sda1=:10:true:gp2'
 devMap['ramdisk-bionic-x64']   = devMap['ramdisk-centos-6-x64']
 devMap['ramdisk-focal-x64']    = devMap['ramdisk-centos-6-x64']
 devMap['ramdisk-jammy-x64']    = devMap['ramdisk-centos-6-x64']
+devMap['ramdisk-noble-x64']    = devMap['ramdisk-centos-6-x64']
 devMap['ramdisk-xenial-x64']   = devMap['ramdisk-centos-6-x64']
 devMap['ramdisk-stretch-x64']  = 'xvda=:8:true:gp2'
 devMap['ramdisk-buster-x64']   = '/dev/xvda=:8:true:gp2'
@@ -541,6 +557,7 @@ labelMap['micro-amazon']      = 'master micro-amazon'
 labelMap['min-bionic-x64']    = 'min-bionic-x6 asan'
 labelMap['min-focal-x64']     = 'min-focal-x64'
 labelMap['min-jammy-x64']     = 'min-jammy-x64'
+labelMap['min-noble-x64']     = 'min-noble-x64'
 labelMap['min-centos-6-x32']  = 'min-centos-6-x32'
 labelMap['min-centos-6-x64']  = 'min-centos-6-x64'
 labelMap['min-centos-7-x64']  = 'min-centos-7-x64'
@@ -562,6 +579,7 @@ labelMap['ramdisk-ol-9-x64']     = 'ramdisk-ol-9-x64'
 labelMap['ramdisk-bionic-x64']   = 'ramdisk-bionic-x64'
 labelMap['ramdisk-focal-x64']    = 'ramdisk-focal-x64'
 labelMap['ramdisk-jammy-x64']    = 'ramdisk-jammy-x64'
+labelMap['ramdisk-noble-x64']    = 'ramdisk-noble-x64'
 labelMap['ramdisk-xenial-x64']   = 'ramdisk-xenial-x64'
 labelMap['ramdisk-stretch-x64']  = 'ramdisk-stretch-x64'
 labelMap['ramdisk-buster-x64']   = 'ramdisk-buster-x64'
@@ -580,6 +598,7 @@ maxUseMap['micro-amazon']      = maxUseMap['multipleUse']
 maxUseMap['min-bionic-x64']    = maxUseMap['singleUse']
 maxUseMap['min-focal-x64']     = maxUseMap['singleUse']
 maxUseMap['min-jammy-x64']     = maxUseMap['singleUse']
+maxUseMap['min-noble-x64']     = maxUseMap['singleUse']
 maxUseMap['min-centos-6-x32']  = maxUseMap['singleUse']
 maxUseMap['min-centos-6-x64']  = maxUseMap['singleUse']
 maxUseMap['min-centos-7-x64']  = maxUseMap['singleUse']
@@ -601,6 +620,7 @@ maxUseMap['ramdisk-ol-9-x64']     = maxUseMap['singleUse']
 maxUseMap['ramdisk-bionic-x64']   = maxUseMap['singleUse']
 maxUseMap['ramdisk-focal-x64']    = maxUseMap['singleUse']
 maxUseMap['ramdisk-jammy-x64']    = maxUseMap['singleUse']
+maxUseMap['ramdisk-noble-x64']    = maxUseMap['singleUse']
 maxUseMap['ramdisk-xenial-x64']   = maxUseMap['singleUse']
 maxUseMap['ramdisk-stretch-x64']  = maxUseMap['singleUse']
 maxUseMap['ramdisk-buster-x64']   = maxUseMap['singleUse']
@@ -616,6 +636,7 @@ jvmoptsMap['micro-amazon']      = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64']    = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64']     = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-centos-6-x32']  = jvmoptsMap['docker']
 jvmoptsMap['min-centos-6-x64']  = jvmoptsMap['docker']
 jvmoptsMap['min-centos-7-x64']  = jvmoptsMap['docker']
@@ -637,6 +658,7 @@ jvmoptsMap['ramdisk-ol-9-x64']     = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-bionic-x64']   = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-focal-x64']    = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-jammy-x64']    = jvmoptsMap['docker']
+jvmoptsMap['ramdisk-noble-x64']    = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-xenial-x64']   = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-stretch-x64']  = jvmoptsMap['docker']
 jvmoptsMap['ramdisk-buster-x64']   = jvmoptsMap['docker']
@@ -730,6 +752,7 @@ String region = 'us-west-1'
             getTemplate('min-bionic-x64',   "${region}${it}"),
             getTemplate('min-focal-x64',    "${region}${it}"),
             getTemplate('min-jammy-x64',    "${region}${it}"),
+            getTemplate('min-noble-x64',    "${region}${it}"),
             // getTemplate('ramdisk-centos-6-x64', "${region}${it}"),
             getTemplate('ramdisk-centos-7-x64', "${region}${it}"),
             getTemplate('ramdisk-centos-8-x64', "${region}${it}"),
@@ -740,6 +763,7 @@ String region = 'us-west-1'
             getTemplate('ramdisk-bionic-x64',   "${region}${it}"),
             getTemplate('ramdisk-focal-x64',    "${region}${it}"),
             getTemplate('ramdisk-jammy-x64',    "${region}${it}"),
+            getTemplate('ramdisk-noble-x64',    "${region}${it}"),
             getTemplate('ramdisk-buster-x64',   "${region}${it}"),
             getTemplate('performance-centos-6-x64', "${region}${it}"),
         ],                                       // List<? extends SlaveTemplate> templates
diff --git a/IaC/rel.cd/init.groovy.d/cloud.groovy b/IaC/rel.cd/init.groovy.d/cloud.groovy
index 05b109998a..9b8c521fdb 100644
--- a/IaC/rel.cd/init.groovy.d/cloud.groovy
+++ b/IaC/rel.cd/init.groovy.d/cloud.groovy
@@ -36,6 +36,7 @@ imageMap['eu-west-1a.min-bookworm-x64']  = 'ami-09176e8784b68a502'
 imageMap['eu-west-1a.min-bullseye-x64']  = 'ami-089f338f3a2e69431'
 imageMap['eu-west-1a.min-buster-x64']    = 'ami-00aa3f69e07141166'
 imageMap['eu-west-1a.min-jammy-x64']     = 'ami-0d2f9b5f04091bdb7'
+imageMap['eu-west-1a.min-noble-x64']     = 'ami-0776c814353b4814d'
 imageMap['eu-west-1a.min-focal-x64']     = 'ami-051d5c7c7ec9cf96c'
 imageMap['eu-west-1a.min-bionic-x64']    = 'ami-027ceacf6a9f484c3'
 imageMap['eu-west-1a.min-hirsute-x64-zenfs'] = 'ami-02469e1cc9f95b137'
@@ -58,6 +59,7 @@ imageMap['eu-west-1b.min-bookworm-x64'] = imageMap['eu-west-1a.min-bookworm-x64'
 imageMap['eu-west-1b.min-bullseye-x64'] = imageMap['eu-west-1a.min-bullseye-x64']
 imageMap['eu-west-1b.min-buster-x64']   = imageMap['eu-west-1a.min-buster-x64']
 imageMap['eu-west-1b.min-jammy-x64']    = imageMap['eu-west-1a.min-jammy-x64']
+imageMap['eu-west-1b.min-noble-x64']    = imageMap['eu-west-1a.min-noble-x64']
 imageMap['eu-west-1b.min-focal-x64']    = imageMap['eu-west-1a.min-focal-x64']
 imageMap['eu-west-1b.min-bionic-x64']   = imageMap['eu-west-1a.min-bionic-x64']
 imageMap['eu-west-1b.min-hirsute-x64-zenfs'] = imageMap['eu-west-1a.min-hirsute-x64-zenfs']
@@ -80,6 +82,7 @@ imageMap['eu-west-1c.min-bookworm-x64'] = imageMap['eu-west-1a.min-bookworm-x64'
 imageMap['eu-west-1c.min-bullseye-x64'] = imageMap['eu-west-1a.min-bullseye-x64']
 imageMap['eu-west-1c.min-buster-x64']   = imageMap['eu-west-1a.min-buster-x64']
 imageMap['eu-west-1c.min-jammy-x64']    = imageMap['eu-west-1a.min-jammy-x64']
+imageMap['eu-west-1c.min-noble-x64']    = imageMap['eu-west-1a.min-noble-x64']
 imageMap['eu-west-1c.min-focal-x64']    = imageMap['eu-west-1a.min-focal-x64']
 imageMap['eu-west-1c.min-bionic-x64']   = imageMap['eu-west-1a.min-bionic-x64']
 imageMap['eu-west-1c.min-hirsute-x64-zenfs'] = imageMap['eu-west-1a.min-hirsute-x64-zenfs']
@@ -93,11 +96,11 @@ imageMap['eu-west-1c.docker-32gb-aarch64']  = imageMap['eu-west-1a.docker-32gb-a
 priceMap = [:]
 priceMap['t2.small'] = '0.02'    // type=t2.small, vCPU=1, memory=2GiB, saving=68%, interruption='<5%', price=0.008000
 priceMap['c5.xlarge'] = '0.15'   // type=c5.xlarge, vCPU=4, memory=8GiB, saving=58%, interruption='<5%', price=0.086400
-priceMap['m5d.4xlarge'] = '0.62' // type=m5d.4xlarge, vCPU=16, memory=64GiB, saving=65%, interruption='<5%', price=0.441500
+priceMap['m5.4xlarge'] = '0.62' // type=m5.4xlarge, vCPU=16, memory=64GiB, saving=65%, interruption='<5%', price=0.441500
 priceMap['r6a.4xlarge'] = '0.42' // type=r6a.4xlarge, vCPU=16, memory=128GiB, saving=66%, interruption='<5%', price=0.361600
 priceMap['i4i.2xlarge'] = '0.32' // type=i4i.2xlarge, vCPU=8, memory=64GiB, saving=68%, interruption='<5%', price=0.248900
 
-priceMap['m6gd.2xlarge'] = '0.24' // aarch64 type=m6gd.2xlarge, vCPU=8, memory=32GiB, saving=60%, interruption='<5%', price=0.161800
+priceMap['m6g.2xlarge'] = '0.24' // aarch64 type=m6g.2xlarge, vCPU=8, memory=32GiB, saving=60%, interruption='<5%', price=0.161800
 
 userMap = [:]
 userMap['docker']            = 'ec2-user'
@@ -106,6 +109,7 @@ userMap['docker2']           = userMap['docker']
 userMap['micro-amazon']      = userMap['docker']
 userMap['min-amazon-2-x64']  = userMap['docker']
 userMap['min-jammy-x64']     = 'ubuntu'
+userMap['min-noble-x64']     = 'ubuntu'
 userMap['min-focal-x64']     = 'ubuntu'
 userMap['min-bionic-x64']    = 'ubuntu'
 userMap['min-centos-7-x64']  = 'centos'
@@ -274,6 +278,8 @@ initMap['min-buster-x64'] = '''
 
     echo '10.30.6.9 repo.ci.percona.com' | sudo tee -a /etc/hosts
 
+    sudo sed -i '/buster-backports/ s/cdn-aws.deb.debian.org/archive.debian.org/' /etc/apt/sources.list
+
     until sudo apt-get update; do
         sleep 1
         echo try again
@@ -285,11 +291,12 @@ initMap['min-buster-x64'] = '''
     else
         JAVA_VER="openjdk-11-jre-headless"
     fi
-    if [[ ${DEB_VER} == "bookworm" ]]; then
-        sudo apt-get -y install ${JAVA_VER} git
+    if [[ ${DEB_VER} == "bookworm" ]] || [[ ${DEB_VER} == "buster" ]]; then
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER} git
         sudo mv /etc/ssl /etc/ssl_old
-        sudo apt-get -y install ${JAVA_VER}
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
         sudo cp -r /etc/ssl_old /etc/ssl
+        sudo DEBIAN_FRONTEND=noninteractive sudo apt-get -y install ${JAVA_VER}
     else
         sudo apt-get -y install ${JAVA_VER} git
     fi
@@ -297,6 +304,7 @@ initMap['min-buster-x64'] = '''
     sudo install -o $(id -u -n) -g $(id -g -n) -d /mnt/jenkins
 '''
 initMap['min-jammy-x64'] = initMap['min-bionic-x64']
+initMap['min-noble-x64'] = initMap['min-bionic-x64']
 initMap['min-focal-x64'] = initMap['min-bionic-x64']
 initMap['min-bookworm-x64'] = initMap['min-buster-x64']
 initMap['min-bullseye-x64'] = initMap['min-buster-x64']
@@ -308,16 +316,16 @@ initMap['docker-32gb-aarch64'] = initMap['docker']
 
 capMap = [:]
 capMap['c5.xlarge']    = '60'
-capMap['m5d.4xlarge'] = '40'
+capMap['m5.4xlarge'] = '40'
 capMap['r6a.4xlarge']   = '40'
 capMap['i4i.2xlarge']  = '40'
 
-capMap['m6gd.2xlarge'] = '20'
+capMap['m6g.2xlarge'] = '20'
 
 typeMap = [:]
 typeMap['micro-amazon']      = 't2.small'
 typeMap['docker']            = 'c5.xlarge'
-typeMap['docker-32gb']       = 'm5d.4xlarge'
+typeMap['docker-32gb']       = 'm5.4xlarge'
 typeMap['docker2']           = 'r6a.4xlarge'
 typeMap['min-centos-7-x64']  = typeMap['docker-32gb']
 typeMap['min-centos-8-x64']  = typeMap['min-centos-7-x64']
@@ -326,6 +334,7 @@ typeMap['min-ol-9-x64']      = 'i4i.2xlarge'
 typeMap['min-amazon-2-x64']  = typeMap['docker']
 typeMap['fips-centos-7-x64'] = typeMap['min-centos-7-x64']
 typeMap['min-jammy-x64']     = typeMap['min-centos-7-x64']
+typeMap['min-noble-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-focal-x64']     = typeMap['min-centos-7-x64']
 typeMap['min-bionic-x64']    = typeMap['min-centos-7-x64']
 typeMap['min-bookworm-x64']  = typeMap['min-centos-7-x64']
@@ -335,7 +344,7 @@ typeMap['min-hirsute-x64-zenfs'] = typeMap['min-centos-7-x64']
 typeMap['min-focal-x64-zenfs'] = typeMap['min-centos-7-x64']
 typeMap['min-bionic-x64-zenfs'] = typeMap['min-centos-7-x64']
 
-typeMap['docker-32gb-aarch64'] = 'm6gd.2xlarge'
+typeMap['docker-32gb-aarch64'] = 'm6g.2xlarge'
 
 execMap = [:]
 execMap['docker']            = '1'
@@ -346,6 +355,7 @@ execMap['min-amazon-2-x64']  = '1'
 execMap['min-bionic-x64']    = '1'
 execMap['min-focal-x64']     = '1'
 execMap['min-jammy-x64']     = '1'
+execMap['min-noble-x64']     = '1'
 execMap['min-centos-7-x64']  = '1'
 execMap['fips-centos-7-x64'] = '1'
 execMap['min-centos-8-x64']  = '1'
@@ -369,6 +379,7 @@ devMap['min-amazon-2-x64']  = '/dev/xvda=:30:true:gp2,/dev/xvdd=:220:true:gp2'
 devMap['min-bionic-x64']        = '/dev/sda1=:30:true:gp2,/dev/sdd=:220:true:gp2'
 devMap['min-focal-x64']         = devMap['min-bionic-x64']
 devMap['min-jammy-x64']         = devMap['min-bionic-x64']
+devMap['min-noble-x64']         = devMap['min-bionic-x64']
 devMap['min-centos-7-x64']      = devMap['min-bionic-x64']
 devMap['fips-centos-7-x64']     = devMap['min-bionic-x64']
 devMap['min-centos-8-x64']      = '/dev/sda1=:30:true:gp2,/dev/sdd=:220:true:gp2'
@@ -392,6 +403,7 @@ labelMap['min-amazon-2-x64']  = ''
 labelMap['min-bionic-x64']    = 'asan'
 labelMap['min-focal-x64']     = ''
 labelMap['min-jammy-x64']     = ''
+labelMap['min-noble-x64']     = ''
 labelMap['min-centos-7-x64']  = ''
 labelMap['fips-centos-7-x64'] = ''
 labelMap['min-centos-8-x64']  = ''
@@ -415,6 +427,7 @@ jvmoptsMap['min-amazon-2-x64']  = jvmoptsMap['docker']
 jvmoptsMap['min-bionic-x64']    = jvmoptsMap['docker']
 jvmoptsMap['min-focal-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-jammy-x64']     = jvmoptsMap['docker']
+jvmoptsMap['min-noble-x64']     = jvmoptsMap['docker']
 jvmoptsMap['min-centos-7-x64']  = jvmoptsMap['docker']
 jvmoptsMap['fips-centos-7-x64'] = jvmoptsMap['docker']
 jvmoptsMap['min-centos-8-x64']  = jvmoptsMap['docker']
@@ -502,6 +515,7 @@ String region = 'eu-west-1'
             getTemplate('micro-amazon',          "${region}${it}"),
             getTemplate('min-amazon-2-x64',      "${region}${it}"),
             getTemplate('min-jammy-x64',         "${region}${it}"),
+            getTemplate('min-noble-x64',         "${region}${it}"),
             getTemplate('min-focal-x64',         "${region}${it}"),
             getTemplate('min-bionic-x64',        "${region}${it}"),
             getTemplate('min-buster-x64',        "${region}${it}"),
@@ -511,7 +525,7 @@ String region = 'eu-west-1'
             getTemplate('min-centos-7-x64',      "${region}${it}"),
             getTemplate('min-bullseye-x64',      "${region}${it}"),
             getTemplate('min-bookworm-x64',      "${region}${it}"),
-            getTemplate('min-hirsute-x64-zenfs', "${region}${it}"),
+            // getTemplate('min-hirsute-x64-zenfs', "${region}${it}"),
             getTemplate('min-focal-x64-zenfs',   "${region}${it}"),
             getTemplate('min-bionic-x64-zenfs',  "${region}${it}"),
             getTemplate('docker-32gb-aarch64',   "${region}${it}"),