diff --git a/Gems/AWSClientAuth/Code/CMakeLists.txt b/Gems/AWSClientAuth/Code/CMakeLists.txt
index 514b1ab79e..bd8b174b65 100644
--- a/Gems/AWSClientAuth/Code/CMakeLists.txt
+++ b/Gems/AWSClientAuth/Code/CMakeLists.txt
@@ -26,9 +26,6 @@ ly_add_target(
             Gem::HttpRequestor
             3rdParty::AWSNativeSDK::AWSClientAuth
             3rdParty::AWSNativeSDK::Core
-    RUNTIME_DEPENDENCIES
-        Gem::AWSCore
-        Gem::HttpRequestor
 )
 
 ly_add_target( 
@@ -48,17 +45,45 @@ ly_add_target(
             3rdParty::AWSNativeSDK::Core
         PUBLIC
             Gem::AWSClientAuth.Static
-    RUNTIME_DEPENDENCIES
-        Gem::AWSCore
-        Gem::HttpRequestor
 )
 
 # Load the "Gem::AWSClientAuth" module in all types of applications.
-ly_create_alias(NAME AWSClientAuth.Servers NAMESPACE Gem TARGETS Gem::AWSClientAuth)
-ly_create_alias(NAME AWSClientAuth.Clients NAMESPACE Gem TARGETS Gem::AWSClientAuth)
+ly_create_alias(
+    NAME AWSClientAuth.Servers
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSClientAuth
+        Gem::AWSCore.Servers
+        Gem::HttpRequestor.Servers
+)
+
+ly_create_alias(
+    NAME AWSClientAuth.Clients
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSClientAuth
+        Gem::AWSCore.Clients
+        Gem::HttpRequestor.Clients
+)
+
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_create_alias(NAME AWSClientAuth.Tools NAMESPACE Gem TARGETS Gem::AWSClientAuth)
-    ly_create_alias(NAME AWSClientAuth.Builders NAMESPACE Gem TARGETS Gem::AWSClientAuth)
+    ly_create_alias(
+        NAME AWSClientAuth.Tools
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSClientAuth
+            Gem::AWSCore.Tools
+            Gem::HttpRequestor.Tools
+    )
+
+    ly_create_alias(
+        NAME AWSClientAuth.Builders
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSClientAuth
+            Gem::AWSCore.Builders
+            Gem::HttpRequestor.Builders
+    )
 endif()
 
 ################################################################################
diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt
index 5fdefa9f9e..808436b7fd 100644
--- a/Gems/AWSCore/Code/CMakeLists.txt
+++ b/Gems/AWSCore/Code/CMakeLists.txt
@@ -45,8 +45,19 @@ ly_add_target(
 )
 
 # clients and servers will use the above Gem::AWSCore module.
-ly_create_alias(NAME AWSCore.Servers NAMESPACE Gem TARGETS Gem::AWSCore)
-ly_create_alias(NAME AWSCore.Clients NAMESPACE Gem TARGETS Gem::AWSCore)
+ly_create_alias(
+    NAME AWSCore.Servers
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSCore
+)
+
+ly_create_alias(
+    NAME AWSCore.Clients
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSCore
+)
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
@@ -84,8 +95,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
             PRIVATE
                 AZ::AzCore
                 Gem::AWSCore.Editor.Static
-        RUNTIME_DEPENDENCIES
-            Gem::AWSCore
     )
 
     # This target is not a real gem module
@@ -106,8 +115,21 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool)
 
     # Builders and Tools (such as the Editor use AWSCore.Editor) use the .Editor module above.
-    ly_create_alias(NAME AWSCore.Tools NAMESPACE Gem TARGETS Gem::AWSCore.Editor)
-    ly_create_alias(NAME AWSCore.Builders NAMESPACE Gem TARGETS Gem::AWSCore.Editor)
+    ly_create_alias(
+        NAME AWSCore.Tools
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore
+            Gem::AWSCore.Editor
+    )
+
+    ly_create_alias(
+        NAME AWSCore.Builders
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore
+            Gem::AWSCore.Editor
+    )
 
 endif()
 
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt b/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
index a2e7a5b2e1..3eb5eafab0 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/CMakeLists.txt
@@ -45,13 +45,26 @@ ly_add_target(
         PUBLIC
             Gem::AWSGameLift.Client.Static
     RUNTIME_DEPENDENCIES
-        Gem::AWSCore
+        Gem::AWSCore.Clients
 )
 
 # Load the "Gem::AWSGameLift" module in all types of applications.
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_create_alias(NAME AWSGameLift.Tools NAMESPACE Gem TARGETS Gem::AWSGameLift.Clients)
-    ly_create_alias(NAME AWSGameLift.Builders NAMESPACE Gem TARGETS Gem::AWSGameLift.Clients)
+    ly_create_alias(
+        NAME AWSGameLift.Tools
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore.Tools
+            Gem::AWSGameLift.Clients
+    )
+
+    ly_create_alias(
+        NAME AWSGameLift.Builders
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore.Builders
+            Gem::AWSGameLift.Clients
+    )
 endif()
 
 ################################################################################
diff --git a/Gems/AWSMetrics/Code/CMakeLists.txt b/Gems/AWSMetrics/Code/CMakeLists.txt
index 2bba967bb7..2e78ee8c42 100644
--- a/Gems/AWSMetrics/Code/CMakeLists.txt
+++ b/Gems/AWSMetrics/Code/CMakeLists.txt
@@ -40,16 +40,41 @@ ly_add_target(
             AZ::AzCore
             AZ::AzFramework
             Gem::AWSMetrics.Static
-    RUNTIME_DEPENDENCIES
-        Gem::AWSCore
 )
 
 # Load the "Gem::AWSMetrics" module in all types of applications.
-ly_create_alias(NAME AWSMetrics.Servers NAMESPACE Gem TARGETS Gem::AWSMetrics)
-ly_create_alias(NAME AWSMetrics.Clients NAMESPACE Gem TARGETS Gem::AWSMetrics)
+ly_create_alias(
+    NAME AWSMetrics.Servers
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSCore.Servers
+        Gem::AWSMetrics
+)
+
+ly_create_alias(
+    NAME AWSMetrics.Clients
+    NAMESPACE Gem
+    TARGETS
+        Gem::AWSCore.Clients
+        Gem::AWSMetrics
+)
+
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_create_alias(NAME AWSMetrics.Tools NAMESPACE Gem TARGETS Gem::AWSMetrics)
-    ly_create_alias(NAME AWSMetrics.Builders NAMESPACE Gem TARGETS Gem::AWSMetrics)
+    ly_create_alias(
+        NAME AWSMetrics.Tools
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore.Tools
+            Gem::AWSMetrics
+    )
+
+    ly_create_alias(
+        NAME AWSMetrics.Builders
+        NAMESPACE Gem
+        TARGETS
+            Gem::AWSCore.Builders
+            Gem::AWSMetrics
+    )
 endif()
 
 ################################################################################