diff --git a/Gems/Atom/Asset/Shader/Code/CMakeLists.txt b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
index 7d82ca5869..a06aa79d24 100644
--- a/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
+++ b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
@@ -98,7 +98,6 @@ ly_add_target(
             Gem::Atom_RPI.Edit
     RUNTIME_DEPENDENCIES
         3rdParty::DirectXShaderCompilerDxc
-        3rdParty::DirectXShaderCompilerDxcAz
         3rdParty::SPIRVCross
         3rdParty::azslc
 )
diff --git a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/BindlessPrototypeSrg.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/BindlessPrototypeSrg.azsli
index 7304af9e1e..0b7224019d 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/BindlessPrototypeSrg.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/BindlessPrototypeSrg.azsli
@@ -29,6 +29,11 @@ ShaderResourceGroupSemantic FloatBufferSemanticId
     FrequencyId = 7;
 };
 
+ShaderResourceGroup FloatBufferSrg : FloatBufferSemanticId
+{
+    StructuredBuffer<FloatBuffer> m_floatBuffer;
+};
+
 ShaderResourceGroup ImageSrg : FrequencyPerScene
 {
     Sampler m_sampler
@@ -43,11 +48,6 @@ ShaderResourceGroup ImageSrg : FrequencyPerScene
     Texture2D m_textureArray[];
 }
 
-ShaderResourceGroup FloatBufferSrg : FloatBufferSemanticId
-{
-    StructuredBuffer<FloatBuffer> m_floatBuffer;
-};
-
 // Helper functions to read data from the FloatBuffer. The FloatBuffer is accessed with a descriptor and a index.
 // The descriptor holds the initial offset within the FloatBuffer, and the index is a sub-index, which increments with each property that is being read.
 // The data needs to be read in the same order as it is allocated on the host.
diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 9b202f2eb2..78c9dc7336 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -28,8 +28,7 @@ ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform
 ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                                TARGETS zstd                       PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
 ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                       TARGETS SQLite                     PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
 ly_associate_package(PACKAGE_NAME SPIRVCross-2020.04.20-rev1-multiplatform               TARGETS SPIRVCross                 PACKAGE_HASH 7c8c0eaa0166c26745c62d2238525af7e27ac058a5db3defdbaec1878e8798dd)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxcAz-5.0.0_az-rev1-multiplatform TARGETS DirectXShaderCompilerDxcAz PACKAGE_HASH 94f24989a7a371d840b513aa5ffaff02747b3d19b119bc1f899427e29978f753)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompiler-2021.05.05-rev1-windows TARGETS DirectXShaderCompilerDxc   PACKAGE_HASH b2e34c4a19b8a996c1e488aeb83233abe1985b6502ef644516ef692029b98f6d)
+ly_associate_package(PACKAGE_NAME DirectXShaderCompiler-1.6.2104-o3de-rev1-windows       TARGETS DirectXShaderCompilerDxc   PACKAGE_HASH 48367b1237c41e17deef3bf39b964665d46daa587de890190fe5dc7224f9beb4)
 ly_associate_package(PACKAGE_NAME azslc-1.7.20-rev1-multiplatform                        TARGETS azslc                      PACKAGE_HASH 45d55f28bea2ef823ed3204f60df52e5e329f42923923d4555fdbdf3bea0af60)
 ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                     TARGETS glad                       PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
 ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                        TARGETS lux_core                   PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)