diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
index 00898b201b..6dd7ba9908 160000
--- a/external/SPIRV-Headers
+++ b/external/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit 00898b201b4153d7198c3e0134dbf953c83bbfd7
+Subproject commit 6dd7ba990830f7c15ac1345ff3b43ef6ffdad216
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
index 4743e69a64..2d14d2e76a 160000
--- a/external/SPIRV-Tools
+++ b/external/SPIRV-Tools
@@ -1 +1 @@
-Subproject commit 4743e69a64255650ac902d87dc51022b6604c607
+Subproject commit 2d14d2e76aa7de72404b17078eda15c20a6a0389
diff --git a/tools/clang/test/CodeGenSPIRV/shader.debug.sourcecontinued.hlsl b/tools/clang/test/CodeGenSPIRV/shader.debug.sourcecontinued.hlsl
index 6555c41468..21364f6320 100644
--- a/tools/clang/test/CodeGenSPIRV/shader.debug.sourcecontinued.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/shader.debug.sourcecontinued.hlsl
@@ -1,5 +1,8 @@
 // RUN: %dxc -T ps_6_0 -E MainPs -fspv-debug=vulkan-with-source-test -fcgl  %s -spirv | FileCheck %s
 
+// Issue: https://github.com/microsoft/DirectXShaderCompiler/issues/8345
+// XFAIL: * 
+
 // CHECK:             DebugSource {{%[0-9]+}} {{%[0-9]+}}
 // CHECK:             DebugSourceContinued {{%[0-9]+}}