diff --git a/scripts/setup/apt-repos/ksplice/noble.list b/scripts/setup/apt-repos/ksplice/noble.list
new file mode 100644
index 0000000000..354df06587
--- /dev/null
+++ b/scripts/setup/apt-repos/ksplice/noble.list
@@ -0,0 +1,2 @@
+deb http://www.ksplice.com/apt noble ksplice
+deb-src http://www.ksplice.com/apt noble ksplice
diff --git a/scripts/setup/apt-repos/teleport/noble.list b/scripts/setup/apt-repos/teleport/noble.list
new file mode 100644
index 0000000000..16c52cda80
--- /dev/null
+++ b/scripts/setup/apt-repos/teleport/noble.list
@@ -0,0 +1 @@
+deb https://apt.releases.teleport.dev/ubuntu noble stable/v16
diff --git a/tools/setup/install-aws-server b/tools/setup/install-aws-server
index c446b0ec47..4e5bbe0ba8 100755
--- a/tools/setup/install-aws-server
+++ b/tools/setup/install-aws-server
@@ -112,8 +112,8 @@ DISK_SIZE=$(lookup disk_size)
 # Determine the architecture
 ARCH=$($AWS ec2 describe-instance-types --instance-types "$INSTANCE_TYPE" --query 'InstanceTypes[*].ProcessorInfo.SupportedArchitectures[0]' --output text)
 
-# Lookup the latest 22.04 image
-AMI_ID=$($AWS ec2 describe-images --owners 099720109477 --filters 'Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-*-22.04*' "Name=architecture,Values=$ARCH" --query 'sort_by(Images, &CreationDate)[-1].ImageId' --output text)
+# Lookup the latest 24.04 image
+AMI_ID=$($AWS ec2 describe-images --owners 099720109477 --filters 'Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-*-24.04*' "Name=architecture,Values=$ARCH" --query 'sort_by(Images, &CreationDate)[-1].ImageId' --output text)
 
 # Verify it doesn't exist already
 ZONE_NAME=$($AWS route53 get-hosted-zone --id "$AWS_ZONE_ID" | jq -r '.HostedZone.Name')