diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2c9c5f33f..e72efcc6d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -121,20 +121,9 @@
       matchPackageNames: [
         'docker.io/library/ubuntu',
       ],
-      allowedVersions: '24.04',
-      matchBaseBranches: [
-        'main',
-      ],
-    },
-    {
-      matchFileNames: [
-        'Dockerfile.builder'
-      ],
-      matchPackageNames: [
-        'docker.io/library/ubuntu',
-      ],
       allowedVersions: '22.04',
       matchBaseBranches: [
+        'main',
         'v1.34',
       ],
     },
diff --git a/Dockerfile.builder b/Dockerfile.builder
index d52bb2ffa..ad380a83c 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -3,7 +3,7 @@
 # Also note that if build fails due to C++ internal error or similar,
 # it is possible that the image build needs more RAM than available by
 # default on non-Linux docker installs.
-FROM docker.io/library/ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 AS base
+FROM docker.io/library/ubuntu:22.04@sha256:09506232a8004baa32c47d68f1e5c307d648fdd59f5e7eaa42aaf87914100db3 AS base
 LABEL maintainer="maintainer@cilium.io"
 ARG TARGETARCH
 # Setup TimeZone to prevent tzdata package asking for it interactively
@@ -27,7 +27,7 @@ RUN apt-get update && \
       # Cilium-envoy build dependencies
       software-properties-common && \
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
-    apt-add-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main" && \
+    apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
       clang-18 clang-tidy-18 clang-tools-18 llvm-18-dev lldb-18 lld-18 clang-format-18 libc++-18-dev libc++abi-18-dev && \
diff --git a/Vagrantfile b/Vagrantfile
index bbc91a15f..db05e9b3e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -32,7 +32,7 @@ apt-get update && \
       python3 python-is-python3 unzip virtualenv wget zip \
       software-properties-common && \
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
-    apt-add-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main" && \
+    apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
       clang-18 clang-tools-18 lldb-18 lld-18 clang-format-18 libc++-18-dev libc++abi-18-dev && \
@@ -41,7 +41,7 @@ apt-get update && \
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "bento/ubuntu-24.04"
+  config.vm.box = "ubuntu/jammy64"
   config.disksize.size = $VM_DISK
 
   config.vm.provider "virtualbox" do |vb|