diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh
index fd19e548bcb..c85d4ec4a7d 100644
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -9,7 +9,7 @@ set -uex
 
 uncollapsed_section_start directx-headers "Building directx-headers"
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.618.1 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
 meson install -C build
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index ee43d9162e5..c4da633cfe5 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -20,7 +20,7 @@ include:
 
 variables:
   DEBIAN_BUILD_BASE_TAG: "20250926-gitlab"
-  DEBIAN_BUILD_TAG: "20250926-gitlab"
+  DEBIAN_BUILD_TAG: "20250926-D3D618"
 
   DEBIAN_TEST_BASE_TAG: "20250926-gitlab"
   DEBIAN_TEST_ANDROID_TAG: "20250926-gitlab"
@@ -42,6 +42,6 @@ variables:
 
   WINDOWS_X64_MSVC_TAG: "20250906-d3d10umd"
 
-  WINDOWS_X64_BUILD_TAG: "20250906-d3d10umd"
+  WINDOWS_X64_BUILD_TAG: "20251001-D3D618"
 
-  WINDOWS_X64_TEST_TAG: "20250906-d3d10umd"
+  WINDOWS_X64_TEST_TAG: "20250926-D3D618"
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index 3356cad906e..717bcbf2188 100644
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.614.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.618.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1
diff --git a/.gitlab-ci/windows/mesa_deps_d3d.ps1 b/.gitlab-ci/windows/mesa_deps_d3d.ps1
index f76641967a0..736db6cb334 100644
--- a/.gitlab-ci/windows/mesa_deps_d3d.ps1
+++ b/.gitlab-ci/windows/mesa_deps_d3d.ps1
@@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Write-Host "Downloading DirectX 12 Agility SDK at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.1 -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.618.1 -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 # Copy Agility SDK into mesa-deps\bin\D3D12
 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12'
diff --git a/meson.build b/meson.build
index dab44ad8057..26ddfa9dae8 100644
--- a/meson.build
+++ b/meson.build
@@ -610,7 +610,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or with_gfxstre
   dep_dxheaders = dependency('directx-headers', required : false)
   if not dep_dxheaders.found()
     dep_dxheaders = dependency('DirectX-Headers',
-      version : '>= 1.614.1',
+      version : '>= 1.618.1',
       fallback : ['DirectX-Headers', 'dep_dxheaders'],
       required : with_gallium_d3d12 or with_microsoft_vk
     )
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml
index 3d28ba94d39..3a1f5664ef7 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml
@@ -16,7 +16,7 @@
     DRIVER_NAME: d3d12
     WGL_DISABLE_ERROR_DIALOGS: "true"
     D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
-    D3D12_AGILITY_SDK_VERSION: 614
+    D3D12_AGILITY_SDK_VERSION: 618
 
 .d3d12-test-piglit:
   extends:
diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index 0dc71dbf54e..6f9dc0dbbd2 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -40,7 +40,7 @@ test-dozen-deqp:
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
-    DZN_AGILITY_SDK_VERSION: 614
+    DZN_AGILITY_SDK_VERSION: 618
     DEQP_FRACTION: 4
   script:
     - . _install/deqp_runner_run.ps1
diff --git a/subprojects/DirectX-Headers.wrap b/subprojects/DirectX-Headers.wrap
index cec75f42c8c..ec46fda801e 100644
--- a/subprojects/DirectX-Headers.wrap
+++ b/subprojects/DirectX-Headers.wrap
@@ -2,5 +2,5 @@
 directory = DirectX-Headers-1.0
 
 url = https://github.com/microsoft/DirectX-Headers.git
-revision = v1.614.1
+revision = v1.618.1
 depth = 1