diff --git a/Gems/Atom/Asset/ImageProcessingAtom/AssetProcessorGemConfig.setreg b/Gems/Atom/Asset/ImageProcessingAtom/Registry/AssetProcessorGemConfig.setreg
similarity index 100%
rename from Gems/Atom/Asset/ImageProcessingAtom/AssetProcessorGemConfig.setreg
rename to Gems/Atom/Asset/ImageProcessingAtom/Registry/AssetProcessorGemConfig.setreg
diff --git a/Gems/AtomLyIntegration/CommonFeatures/AssetProcessorGemConfig.setreg b/Gems/AtomLyIntegration/CommonFeatures/Registry/AssetProcessorGemConfig.setreg
similarity index 100%
rename from Gems/AtomLyIntegration/CommonFeatures/AssetProcessorGemConfig.setreg
rename to Gems/AtomLyIntegration/CommonFeatures/Registry/AssetProcessorGemConfig.setreg
diff --git a/Gems/AudioEngineWwise/AssetProcessorGemConfig.setreg b/Gems/AudioEngineWwise/Registry/AssetProcessorGemConfig.setreg
similarity index 100%
rename from Gems/AudioEngineWwise/AssetProcessorGemConfig.setreg
rename to Gems/AudioEngineWwise/Registry/AssetProcessorGemConfig.setreg
diff --git a/Gems/Blast/AssetProcessorGemConfig.setreg b/Gems/Blast/Registry/AssetProcessorGemConfig.setreg
similarity index 100%
rename from Gems/Blast/AssetProcessorGemConfig.setreg
rename to Gems/Blast/Registry/AssetProcessorGemConfig.setreg
diff --git a/Gems/PhysX/AssetProcessorGemConfig.setreg b/Gems/PhysX/Registry/AssetProcessorGemConfig.setreg
similarity index 70%
rename from Gems/PhysX/AssetProcessorGemConfig.setreg
rename to Gems/PhysX/Registry/AssetProcessorGemConfig.setreg
index 993a99616b..a5ac31131c 100644
--- a/Gems/PhysX/AssetProcessorGemConfig.setreg
+++ b/Gems/PhysX/Registry/AssetProcessorGemConfig.setreg
@@ -10,6 +10,11 @@
                     "glob": "*.pxheightfield",
                     "params": "copy",
                     "productAssetType": "{B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}"
+                },
+                "RC PhysXMeshAsset": {
+                    "glob": "*.pxmesh",
+                    "params": "copy",
+                    "productAssetType": "{7A2871B9-5EAB-4DE0-A901-B0D2C6920DDB}"
                 }
             }
         }
diff --git a/Gems/WhiteBox/AssetProcessorGemConfig.setreg b/Gems/WhiteBox/Registry/AssetProcessorGemConfig.setreg
similarity index 100%
rename from Gems/WhiteBox/AssetProcessorGemConfig.setreg
rename to Gems/WhiteBox/Registry/AssetProcessorGemConfig.setreg
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
index 255bac17e0..87133ba34b 100644
--- a/Registry/AssetProcessorPlatformConfig.setreg
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -480,17 +480,6 @@
                     "glob": "*.der",
                     "params": "copy"
                 },
-                "RC PhysXMeshAsset": {
-                    "glob": "*.pxmesh",
-                    "params": "copy",
-                    "productAssetType": "{7A2871B9-5EAB-4DE0-A901-B0D2C6920DDB}"
-                },
-                // Copy over cooked PhysX heightfield
-                "RC PhysX HeightField": {
-                    "glob": "*.pxheightfield",
-                    "params": "copy",
-                    "productAssetType": "{B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}"
-                },
                 "RC filetag": {
                     "glob": "*.filetag",
                     "params": "copy",