diff --git a/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
index 77e8a42871..ffaa3f828f 100644
--- a/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
+++ b/Gems/NvCloth/Code/Platform/Android/PAL_android.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-android TARGETS NvCloth PACKAGE_HASH 01eb0bc7fae91bb088a7d4c0f9555743a2c442f7b823a89072eacad361a20b42)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
index 77e8a42871..1e856fa1c2 100644
--- a/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
+++ b/Gems/NvCloth/Code/Platform/Mac/PAL_mac.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac TARGETS NvCloth PACKAGE_HASH 9156548da6fc35f89b592306cc512257042159e3c9c2ce5f483d8d0701b63716)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
index afedeb2df8..f62da3def9 100644
--- a/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
+++ b/Gems/NvCloth/Code/Platform/Windows/PAL_windows.cmake
@@ -7,4 +7,4 @@
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows TARGETS NvCloth PACKAGE_HASH 2f521d961443d66ca941800377a8afb328daf8e39f4808e4d18dde382451ab46)
diff --git a/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
index 77e8a42871..fa099bfd3e 100644
--- a/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
+++ b/Gems/NvCloth/Code/Platform/iOS/PAL_ios.cmake
@@ -5,6 +5,6 @@
 #
 #
 
-ly_associate_package(PACKAGE_NAME NvCloth-1.1.6-rev2-multiplatform TARGETS NvCloth PACKAGE_HASH 535d927782fa5d3086c5f813c46392ee3c294fc117dcd87b055d469c3f034356)
+ly_associate_package(PACKAGE_NAME NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios TARGETS NvCloth PACKAGE_HASH 62e17ed51da9a3452b7397a4e1f64aca79e8f4c70181a75aeb6ca596c6692971)
 
 set(PAL_TRAIT_NVCLOTH_USE_STUB FALSE)
diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index 21f9172055..9b867a7652 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -74,9 +74,6 @@ ly_create_alias(NAME PhysX.Servers NAMESPACE Gem TARGETS Gem::PhysX)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
 
-     ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38) 
-     ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform     TARGETS v-hacd   PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
-
     ly_add_target(
         NAME PhysX.Editor.Static STATIC
         NAMESPACE Gem
diff --git a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
index 9033ea99c2..cf5b77edc3 100644
--- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-0.3.3-rev2-multiplatform TARGETS poly2tri PACKAGE_HASH 04092d06716f59b936b61906eaf3647db23b685d81d8b66131eb53e0aeaa1a38) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.0-rev1-multiplatform TARGETS v-hacd PACKAGE_HASH 5c71aef19cc9787d018d64eec076e9f51ea5a3e0dc6b6e22e57c898f6cc4afe3)
+endif()
diff --git a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
index 9033ea99c2..88c3808ed9 100644
--- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-mac TARGETS poly2tri PACKAGE_HASH 23e49e6b06d79327985d17b40bff20ab202519c283a842378f5f1791c1bf8dbc) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.3-1a49edf-rev1-mac TARGETS v-hacd PACKAGE_HASH c1de9fadb2c0db42416a1bd5fe3423401c6f41b58409bc652064b5ad23667c09)
+endif()
diff --git a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
index 9033ea99c2..cc671f7014 100644
--- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
+++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake
@@ -6,3 +6,8 @@
 #
 
 set(PAL_TRAIT_PHYSX_SUPPORTED TRUE)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+     ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-windows TARGETS poly2tri PACKAGE_HASH 5fea2bf294e5130e0654fbfa39f192e6369f3853901dde90bb9b3f3a11edcb1e) 
+     ly_associate_package(PACKAGE_NAME v-hacd-2.3-1a49edf-rev1-windows TARGETS v-hacd PACKAGE_HASH c5826ec28aedc3b5931ddf655d055395872cd3e75cd829f5745a2e607deb7468)
+endif()