diff --git a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
index bdfbd8bdad..464144fb45 100644
--- a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
+++ b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
@@ -31,11 +31,15 @@ EOF
 		curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key |
 			gpg --dearmour -o $rootfs_dir/etc/apt/trusted.gpg.d/intel-sgx-deb.gpg
 		sed -i -e "s/bootstrap=Ubuntu/bootstrap=Ubuntu intel-sgx/" $multistrap_conf
+		SUITE=$OS_VERSION
+		# Intel does not release sgx stuff for non-LTS, thus if using oracular (24.10),
+		# we need to enforce getting libtdx-attest from noble.
+		[ "$SUITE" = "oracular" ] && SUITE="noble"
 		cat >> $multistrap_conf << EOF
 
 [intel-sgx]
 source=https://download.01.org/intel-sgx/sgx_repo/ubuntu
-suite=$OS_VERSION
+suite=$SUITE
 packages=libtdx-attest=1.22\*
 EOF
 	fi
diff --git a/versions.yaml b/versions.yaml
index bcff523577..21590af1c7 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -117,7 +117,7 @@ assets:
     architecture:
       aarch64:
         name: "ubuntu"
-        version: "focal" # 20.04 LTS
+        version: "jammy" # 22.04 LTS
         nvidia-gpu:
           name: "ubuntu"
           version: "jammy" # 22.04 LTS
@@ -126,19 +126,19 @@ assets:
           version: "jammy" # 22.04 LTS
       ppc64le:
         name: "ubuntu"
-        version: "focal" # 20.04 LTS
+        version: "jammy" # 22.04 LTS
       s390x:
         name: "ubuntu"
-        version: "focal" # 20.04 LTS
+        version: "jammy" # 22.04 LTS
         confidential:
           name: "ubuntu"
-          version: "focal" # 20.04 LTS
+          version: "jammy" # 22.04 LTS
       x86_64:
         name: "ubuntu"
-        version: "focal" # 20.04 lTS
+        version: "jammy" # 22.04 lTS
         confidential:
           name: "ubuntu"
-          version: "focal" # 20.04 LTS
+          version: "oracular" # 24.10
         mariner:
           name: "cbl-mariner"
           version: "3.0"
@@ -168,13 +168,13 @@ assets:
       # there is no such Rust target
       ppc64le:
         name: "ubuntu"
-        version: "focal" # 20.04 LTS
+        version: "jammy" # 22.04 LTS
       s390x:
         name: "ubuntu"
-        version: "focal" # 20.04 LTS
+        version: "jammy" # 22.04 LTS
         confidential:
           name: "ubuntu"
-          version: "focal" # 20.04 LTS
+          version: "jammy" # 22.04 LTS
       x86_64:
         name: "alpine"
         version: "3.18"