diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile
index 3a8da7d7ec79de..caa6fb9abf2617 100644
--- a/scripts/azure-pipelines/android/Dockerfile
+++ b/scripts/azure-pipelines/android/Dockerfile
@@ -44,6 +44,10 @@ ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
 ## PowerShell
 ENV APT_PACKAGES="$APT_PACKAGES powershell"
 
+# The BUILD_DATE argument forces cache invalidation so we get updated apt dependencies
+ARG BUILD_DATE
+RUN echo "Build date: ${BUILD_DATE}"
+
 RUN <<END_OF_SCRIPT bash
 set -e
 
diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml
index cc4dab4e9c76b1..e00be2b180ec4f 100644
--- a/scripts/azure-pipelines/android/azure-pipelines.yml
+++ b/scripts/azure-pipelines/android/azure-pipelines.yml
@@ -30,7 +30,7 @@ jobs:
   - name: ANDROID_DOCKER_IMAGE
     value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-04-08'
   - name: LINUX_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-04-08'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-04-21'
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
   - bash: |
diff --git a/scripts/azure-pipelines/create-docker-images.ps1 b/scripts/azure-pipelines/create-docker-images.ps1
index 61faa6046f3c2e..26c3300abd84d0 100644
--- a/scripts/azure-pipelines/create-docker-images.ps1
+++ b/scripts/azure-pipelines/create-docker-images.ps1
@@ -1,23 +1,44 @@
 # Create Docker images for vcpkg
 
+[CmdletBinding()]
+param(
+    [switch]$OnlyAndroid,
+    [switch]$OnlyLinux
+)
+
+if ($OnlyAndroid -and $OnlyLinux) {
+    Write-Error "At most one of {-OnlyAndroid, -OnlyLinux} may be set"
+    return 1
+}
+
+if ($OnlyAndroid) {
+    Write-Host "Only building Android"
+    $BuildAndroid = $true
+    $BuildLinux = $false
+} elseif ($OnlyLinux) {
+    Write-Host "Only building Linux"
+    $BuildAndroid = $false
+    $BuildLinux = $true
+} else {
+    $BuildAndroid = $true
+    $BuildLinux = $true
+}
+
 function Build-Image {
     param(
+    $AcrRegistry,
     [string]$Location,
     [string]$ImageName,
-    [string]$ContainerRegistryName,
     [string]$Date
     )
 
     Push-Location $Location
     try {
-
-        docker build . -t $ImageName
-
-        $remote = [string]::Format('{0}.azurecr.io/{1}:{2}', $ContainerRegistryName, $ImageName, $Date)
-        docker tag $ImageName $remote
+        docker build . -t $ImageName --build-arg BUILD_DATE=$Date
+        $remote = [string]::Format('{0}/{1}:{2}', $AcrRegistry.LoginServer, $ImageName, $Date)
+        docker image tag $ImageName $remote
 
         docker push $remote
-
         Write-Host "Remote: $remote"
     } finally {
         Pop-Location
@@ -32,14 +53,18 @@ $ErrorActionPreference = 'Stop'
 $registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName
 Connect-AzContainerRegistry -Name $registry.Name
 
-docker builder prune -f --filter "until=24h"
-Build-Image -Location "$PSScriptRoot/android" `
-    -ImageName "vcpkg-android" `
-    -ContainerRegistryName $ContainerRegistryName `
-    -Date $Date
-Build-Image -Location "$PSScriptRoot/linux" `
-    -ImageName "vcpkg-linux" `
-    -ContainerRegistryName $ContainerRegistryName `
-    -Date $Date
-
-docker logout
+if ($BuildAndroid) {
+    Build-Image -AcrRegistry $registry `
+        -Location "$PSScriptRoot/android" `
+        -ImageName "vcpkg-android" `
+        -Date $Date
+}
+
+if ($BuildLinux) {
+    Build-Image -AcrRegistry $registry `
+        -Location "$PSScriptRoot/linux" `
+        -ImageName "vcpkg-linux" `
+        -Date $Date
+}
+
+docker logout $registry.LoginServer
diff --git a/scripts/azure-pipelines/linux/Dockerfile b/scripts/azure-pipelines/linux/Dockerfile
index 0370c3cd059f5a..c7db110e92116e 100644
--- a/scripts/azure-pipelines/linux/Dockerfile
+++ b/scripts/azure-pipelines/linux/Dockerfile
@@ -1,7 +1,10 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:jammy-20250126
+FROM ubuntu:jammy-20250404
 ADD provision-image.sh /provision-image.sh
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y curl gnupg ca-certificates
+  apt-get install --no-install-recommends -y curl gnupg ca-certificates
+# The BUILD_DATE argument forces cache invalidation so we get updated apt dependencies
+ARG BUILD_DATE
+RUN echo "Build date: ${BUILD_DATE}"
 RUN chmod +x /provision-image.sh && /provision-image.sh
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index b4cd89b7a9069d..cc782a4ee834d4 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -27,7 +27,7 @@ jobs:
   - name: VCPKG_DOWNLOADS
     value: /mnt/vcpkg-ci/downloads
   - name: LINUX_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-03-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-04-21'
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
   - bash: |
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index edd168688017ce..a541ad3e02abcf 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -45,14 +45,46 @@ apt-get -y upgrade
 ## vcpkg prerequisites
 APT_PACKAGES="git curl zip unzip tar"
 
-## common build dependencies
-APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \
-  build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \
-  libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \
-  libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin libltdl-dev \
-  flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
-  xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \
-  pkg-config meson nasm cmake ninja-build"
+## essentials
+APT_PACKAGES="$APT_PACKAGES \
+  autoconf autoconf-archive \
+  autopoint \
+  build-essential \
+  cmake \
+  gcc g++ gfortran \
+  libnuma1 libnuma-dev \
+  libtool libtool-bin libltdl-dev \
+  libudev-dev \
+"
+
+## vcpkg_find_acquire_program
+APT_PACKAGES="$APT_PACKAGES \
+  bison libbison-dev \
+  flex \
+  gperf \
+  nasm \
+  ninja-build \
+  pkg-config \
+  python3 \
+  ruby-full \
+  swig \
+  yasm \
+"
+
+## mesa and X essentials
+APT_PACKAGES="$APT_PACKAGES \
+  mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev libgles2-mesa-dev \
+  libx11-dev \
+  libxaw7-dev \
+  libxcursor-dev \
+  libxi-dev \
+  libxinerama-dev \
+  libxkbcommon-x11-dev \
+  libxrandr-dev \
+  libxt-dev \
+  libxxf86vm-dev \
+  xutils-dev \
+"
 
 ## required by qt5-base
 APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \