diff --git a/Templates/DefaultGem/Template/Code/CMakeLists.txt b/Templates/DefaultGem/Template/Code/CMakeLists.txt
index 3511f8ff83..b0e52dd79f 100644
--- a/Templates/DefaultGem/Template/Code/CMakeLists.txt
+++ b/Templates/DefaultGem/Template/Code/CMakeLists.txt
@@ -59,6 +59,12 @@ ly_add_target(
             Gem::${Name}.Static
 )
 
+# By default, we will specify that the above target ${Name} would be used by
+# Client and Server type targets when this gem is enabled.  If you don't want it
+# active in Clients or Servers by default, delete one of both of the following lines:
+ly_create_alias(NAME ${Name}.Clients NAMESPACE Gem TARGETS Gem::${Name})
+ly_create_alias(NAME ${Name}.Servers NAMESPACE Gem TARGETS Gem::${Name})
+
 # If we are on a host platform, we want to add the host tools targets like the ${Name}.Editor target which
 # will also depend on ${Name}.Static
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -94,6 +100,14 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             PUBLIC
                 Gem::${Name}.Editor.Static
     )
+
+    # By default, we will specify that the above target ${Name} would be used by
+    # Tool and Builder type targets when this gem is enabled.  If you don't want it
+    # active in Tools or Builders by default, delete one of both of the following lines:
+    ly_create_alias(NAME ${Name}.Tools    NAMESPACE Gem TARGETS Gem::${Name}.Editor)
+    ly_create_alias(NAME ${Name}.Builders NAMESPACE Gem TARGETS Gem::${Name}.Editor)
+
+
 endif()
 
 ################################################################################
diff --git a/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake b/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
index 459e33f547..f77348395b 100644
--- a/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
+++ b/Templates/DefaultProject/Template/Code/${NameLower}_files.cmake
@@ -13,7 +13,5 @@ set(FILES
     Include/${Name}/${Name}Bus.h
     Source/${Name}SystemComponent.cpp
     Source/${Name}SystemComponent.h
-    runtime_dependencies.cmake
-    tool_dependencies.cmake
-    server_dependencies.cmake
+    enabled_gems.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/CMakeLists.txt b/Templates/DefaultProject/Template/Code/CMakeLists.txt
index 38999c031c..b116fb2044 100644
--- a/Templates/DefaultProject/Template/Code/CMakeLists.txt
+++ b/Templates/DefaultProject/Template/Code/CMakeLists.txt
@@ -64,41 +64,47 @@ ly_add_target(
 ################################################################################
 # Gem dependencies
 ################################################################################
-ly_add_project_dependencies(
-    PROJECT_NAME
-        ${Name}
+
+# The GameLauncher uses "Clients" gem variants:
+ly_enable_gems(
+    PROJECT_NAME ${Name} GEM_FILE enabled_gems.cmake
     TARGETS 
         ${Name}.GameLauncher
-    DEPENDENCIES_FILES
-        runtime_dependencies.cmake
-        ${pal_dir}/${PAL_PLATFORM_NAME_LOWERCASE}_runtime_dependencies.cmake
-)
+    VARIANTS 
+        Clients)
 
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_add_project_dependencies(
-        PROJECT_NAME
-            ${Name}
+
+    # the builder type applications use the "Builders" variants of the enabled gems.
+    ly_enable_gems(
+        PROJECT_NAME ${Name} GEM_FILE enabled_gems.cmake
         TARGETS
             AssetBuilder
             AssetProcessor
             AssetProcessorBatch
+        VARIANTS 
+            Builders)
+    
+    # the Editor applications use the "Tools" variants of the enabled gems.
+    ly_enable_gems(
+        PROJECT_NAME ${Name} GEM_FILE enabled_gems.cmake
+        TARGETS
             Editor
-        DEPENDENCIES_FILES
-            tool_dependencies.cmake
-            ${pal_dir}/${PAL_PLATFORM_NAME_LOWERCASE}_tool_dependencies.cmake
-    )
+        VARIANTS 
+            Tools)
 endif()
 
 if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
-    ly_add_project_dependencies(
-        PROJECT_NAME
-            ${Name}
+    # this property causes it to actually make a ServerLauncher.
+    # if you don't want a Server application, you can remove this and the
+    # following ly_enable_gems lines.
+    set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS ${Name})
+    
+    # The ServerLauncher uses the "Servers" variants of enabled gems:
+    ly_enable_gems(
+        PROJECT_NAME ${Name} GEM_FILE enabled_gems.cmake
         TARGETS
             ${Name}.ServerLauncher
-        DEPENDENCIES_FILES
-            server_dependencies.cmake
-            ${pal_dir}/${PAL_PLATFORM_NAME_LOWERCASE}_server_dependencies.cmake
-    )
-    set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS ${Name})
-
+        VARIANTS 
+            Servers)
 endif()
diff --git a/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
index b774cd944f..78fd98ba6c 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Android/${NameLower}_android_files.cmake
@@ -11,7 +11,4 @@
 
 set(FILES
     PAL_android.cmake
-    android_runtime_dependencies.cmake
-    android_tool_dependencies.cmake
-    android_server_dependencies.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/Platform/Android/android_runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/android_runtime_dependencies.cmake
deleted file mode 100644
index a1ebd6e455..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Android/android_runtime_dependencies.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Android/android_server_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/android_server_dependencies.cmake
deleted file mode 100644
index fe28e294e9..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Android/android_server_dependencies.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Android/android_tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Android/android_tool_dependencies.cmake
deleted file mode 100644
index 14e6f1aa4c..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Android/android_tool_dependencies.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
-
diff --git a/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
index 58fc59d265..ee0b06efc4 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Linux/${NameLower}_linux_files.cmake
@@ -11,7 +11,4 @@
 
 set(FILES
     PAL_linux.cmake
-    linux_runtime_dependencies.cmake
-    linux_tool_dependencies.cmake
-    linux_server_dependencies.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/linux_runtime_dependencies.cmake
deleted file mode 100644
index a54c22de8c..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_runtime_dependencies.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-    Gem::Atom_RHI_Vulkan.Builders
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_server_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/linux_server_dependencies.cmake
deleted file mode 100644
index fe28e294e9..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_server_dependencies.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Linux/linux_tool_dependencies.cmake
deleted file mode 100644
index a1ebd6e455..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Linux/linux_tool_dependencies.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
index 7eb776e3a6..e14e028c88 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Mac/${NameLower}_mac_files.cmake
@@ -12,7 +12,4 @@
 set(FILES
     ../../../Resources/Platform/Mac/Info.plist
     PAL_mac.cmake
-    mac_runtime_dependencies.cmake
-    mac_tool_dependencies.cmake
-    mac_server_dependencies.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/mac_runtime_dependencies.cmake
deleted file mode 100644
index 2821493346..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_runtime_dependencies.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Metal.Private
-    Gem::Atom_RHI_Null.Private
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_server_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/mac_server_dependencies.cmake
deleted file mode 100644
index fe28e294e9..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_server_dependencies.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Mac/mac_tool_dependencies.cmake
deleted file mode 100644
index adf5485ed4..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Mac/mac_tool_dependencies.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Metal.Private
-    Gem::Atom_RHI_Metal.Builders
-    Gem::Atom_RHI_Vulkan.Builders
-    Gem::Atom_RHI_DX12.Builders
-    Gem::Atom_RHI_Null.Builders
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
index 8fee85a163..b6eb718a05 100644
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/Windows/${NameLower}_windows_files.cmake
@@ -11,7 +11,4 @@
 
 set(FILES
     PAL_windows.cmake
-    windows_runtime_dependencies.cmake
-    windows_tool_dependencies.cmake
-    windows_server_dependencies.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/windows_runtime_dependencies.cmake
deleted file mode 100644
index 514a61aa57..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_runtime_dependencies.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-    Gem::Atom_RHI_DX12.Private
-    Gem::Atom_RHI_Null.Private
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_server_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/windows_server_dependencies.cmake
deleted file mode 100644
index fe28e294e9..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_server_dependencies.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/Windows/windows_tool_dependencies.cmake
deleted file mode 100644
index b7f4b82126..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/Windows/windows_tool_dependencies.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-    Gem::Atom_RHI_Vulkan.Builders
-    Gem::Atom_RHI_DX12.Private
-    Gem::Atom_RHI_DX12.Builders
-    Gem::Atom_RHI_Null.Private
-    Gem::Atom_RHI_Null.Builders
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
index 41a6d13884..44f15538c8 100644
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
+++ b/Templates/DefaultProject/Template/Code/Platform/iOS/${NameLower}_ios_files.cmake
@@ -12,7 +12,4 @@
 set(FILES
     ../Resources/Platform/iOS/Info.plist
     PAL_ios.cmake
-    ios_runtime_dependencies.cmake
-    ios_tool_dependencies.cmake
-    ios_server_dependencies.cmake
 )
diff --git a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/ios_runtime_dependencies.cmake
deleted file mode 100644
index e49929c6e1..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_runtime_dependencies.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Metal.Private
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_server_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/ios_server_dependencies.cmake
deleted file mode 100644
index fe28e294e9..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_server_dependencies.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
diff --git a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/Platform/iOS/ios_tool_dependencies.cmake
deleted file mode 100644
index 14e6f1aa4c..0000000000
--- a/Templates/DefaultProject/Template/Code/Platform/iOS/ios_tool_dependencies.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-)
-
diff --git a/Templates/DefaultProject/Template/Code/server_dependencies.cmake b/Templates/DefaultProject/Template/Code/enabled_gems.cmake
similarity index 70%
rename from Templates/DefaultProject/Template/Code/server_dependencies.cmake
rename to Templates/DefaultProject/Template/Code/enabled_gems.cmake
index 3982bbb166..dfb7d93233 100644
--- a/Templates/DefaultProject/Template/Code/server_dependencies.cmake
+++ b/Templates/DefaultProject/Template/Code/enabled_gems.cmake
@@ -9,8 +9,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # {END_LICENSE}
 
-set(GEM_DEPENDENCIES
+set(ENABLED_GEMS
     Project::${Name}
-    Gem::Maestro
-    Gem::LmbrCentral
+    Atom_AtomBridge
+    Camera
+    CameraFramework
+    EditorPythonBindings
+    EMotionFX
+    GradientSignal
+    ImGui
+    LmbrCentral
+    LyShine
+    Maestro
+    NvCloth
+    SceneProcessing
+    TextureAtlas
+    WhiteBox
 )
diff --git a/Templates/DefaultProject/Template/Code/runtime_dependencies.cmake b/Templates/DefaultProject/Template/Code/runtime_dependencies.cmake
deleted file mode 100644
index ce8df8152d..0000000000
--- a/Templates/DefaultProject/Template/Code/runtime_dependencies.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Project::${Name}
-    Gem::Maestro
-    Gem::TextureAtlas
-    Gem::LmbrCentral
-    Gem::NvCloth
-    Gem::LyShine
-    Gem::Camera
-    Gem::CameraFramework
-    Gem::Atom_RHI.Private
-    Gem::EMotionFX
-    Gem::Atom_RPI.Private
-    Gem::Atom_Feature_Common
-    Gem::ImGui
-    Gem::Atom_Bootstrap
-    Gem::Atom_Component_DebugCamera
-    Gem::AtomImGuiTools
-    Gem::AtomLyIntegration_CommonFeatures
-    Gem::EMotionFX_Atom
-    Gem::ImguiAtom
-    Gem::Atom_AtomBridge
-    Gem::GradientSignal
-    Gem::AtomFont
-    Gem::WhiteBox
-)
diff --git a/Templates/DefaultProject/Template/Code/tool_dependencies.cmake b/Templates/DefaultProject/Template/Code/tool_dependencies.cmake
deleted file mode 100644
index 010d45bd0f..0000000000
--- a/Templates/DefaultProject/Template/Code/tool_dependencies.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# {BEGIN_LICENSE}
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# {END_LICENSE}
-
-set(GEM_DEPENDENCIES
-    Project::${Name}
-    Gem::Maestro.Editor
-    Gem::TextureAtlas
-    Gem::LmbrCentral.Editor
-    Gem::NvCloth.Editor
-    Gem::LyShine.Editor
-    Gem::SceneProcessing.Editor
-    Gem::EditorPythonBindings.Editor
-    Gem::Camera.Editor
-    Gem::CameraFramework
-    Gem::Atom_RHI.Private
-    Gem::EMotionFX.Editor
-    Gem::Atom_RPI.Builders
-    Gem::Atom_RPI.Editor
-    Gem::Atom_Feature_Common.Builders
-    Gem::Atom_Feature_Common.Editor
-    Gem::ImGui.Editor
-    Gem::Atom_Bootstrap
-    Gem::Atom_Asset_Shader.Builders
-    Gem::Atom_Component_DebugCamera
-    Gem::AtomImGuiTools
-    Gem::AtomLyIntegration_CommonFeatures.Editor
-    Gem::EMotionFX_Atom.Editor
-    Gem::ImageProcessingAtom.Editor
-    Gem::Atom_AtomBridge.Editor
-    Gem::ImguiAtom
-    Gem::AtomFont
-    Gem::AtomToolsFramework.Editor
-    Gem::GradientSignal.Editor
-    Gem::WhiteBox.Editor
-)
diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json
index 56278a6b04..7add7e34f7 100644
--- a/Templates/DefaultProject/template.json
+++ b/Templates/DefaultProject/template.json
@@ -66,24 +66,6 @@
             "isTemplated": true,
             "isOptional": false
         },
-        {
-            "file": "Code/Platform/Android/android_runtime_dependencies.cmake",
-            "origin": "Code/Platform/Android/android_runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Android/android_server_dependencies.cmake",
-            "origin": "Code/Platform/Android/android_server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Android/android_tool_dependencies.cmake",
-            "origin": "Code/Platform/Android/android_tool_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
         {
             "file": "Code/Platform/Linux/${NameLower}_linux_files.cmake",
             "origin": "Code/Platform/Linux/${NameLower}_linux_files.cmake",
@@ -102,24 +84,6 @@
             "isTemplated": true,
             "isOptional": false
         },
-        {
-            "file": "Code/Platform/Linux/linux_runtime_dependencies.cmake",
-            "origin": "Code/Platform/Linux/linux_runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Linux/linux_server_dependencies.cmake",
-            "origin": "Code/Platform/Linux/linux_server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Linux/linux_tool_dependencies.cmake",
-            "origin": "Code/Platform/Linux/linux_tool_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
         {
             "file": "Code/Platform/Mac/${NameLower}_mac_files.cmake",
             "origin": "Code/Platform/Mac/${NameLower}_mac_files.cmake",
@@ -138,24 +102,6 @@
             "isTemplated": true,
             "isOptional": false
         },
-        {
-            "file": "Code/Platform/Mac/mac_runtime_dependencies.cmake",
-            "origin": "Code/Platform/Mac/mac_runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Mac/mac_server_dependencies.cmake",
-            "origin": "Code/Platform/Mac/mac_server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Mac/mac_tool_dependencies.cmake",
-            "origin": "Code/Platform/Mac/mac_tool_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
         {
             "file": "Code/Platform/Windows/${NameLower}_shared_windows_files.cmake",
             "origin": "Code/Platform/Windows/${NameLower}_shared_windows_files.cmake",
@@ -174,24 +120,6 @@
             "isTemplated": true,
             "isOptional": false
         },
-        {
-            "file": "Code/Platform/Windows/windows_runtime_dependencies.cmake",
-            "origin": "Code/Platform/Windows/windows_runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Windows/windows_server_dependencies.cmake",
-            "origin": "Code/Platform/Windows/windows_server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/Windows/windows_tool_dependencies.cmake",
-            "origin": "Code/Platform/Windows/windows_tool_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
         {
             "file": "Code/Platform/iOS/${NameLower}_ios_files.cmake",
             "origin": "Code/Platform/iOS/${NameLower}_ios_files.cmake",
@@ -210,24 +138,6 @@
             "isTemplated": true,
             "isOptional": false
         },
-        {
-            "file": "Code/Platform/iOS/ios_runtime_dependencies.cmake",
-            "origin": "Code/Platform/iOS/ios_runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/iOS/ios_server_dependencies.cmake",
-            "origin": "Code/Platform/iOS/ios_server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/Platform/iOS/ios_tool_dependencies.cmake",
-            "origin": "Code/Platform/iOS/ios_tool_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
         {
             "file": "Code/Source/${Name}Module.cpp",
             "origin": "Code/Source/${Name}Module.cpp",
@@ -247,20 +157,8 @@
             "isOptional": false
         },
         {
-            "file": "Code/runtime_dependencies.cmake",
-            "origin": "Code/runtime_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/server_dependencies.cmake",
-            "origin": "Code/server_dependencies.cmake",
-            "isTemplated": true,
-            "isOptional": false
-        },
-        {
-            "file": "Code/tool_dependencies.cmake",
-            "origin": "Code/tool_dependencies.cmake",
+            "file": "Code/enabled_gems.cmake",
+            "origin": "Code/enabled_gems.cmake",
             "isTemplated": true,
             "isOptional": false
         },
diff --git a/cmake/Gems.cmake b/cmake/Gems.cmake
index 3e9ce97329..caa5b74c93 100644
--- a/cmake/Gems.cmake
+++ b/cmake/Gems.cmake
@@ -84,6 +84,7 @@ endfunction()
 # note that it can't do this immediately, so it saves the data for later processing.
 # Note: If you don't supply a project name, it will apply it across the board to all projects.
 # this is useful in the case of "ly_add_gems being called for so called 'mandatory gems' inside the engine.
+# if you specify a gem name with a namespace, it will be used, otherwise it will assume Gem::
 function(ly_enable_gems)
     set(options)
     set(oneValueArgs PROJECT_NAME GEM_FILE)
@@ -176,19 +177,24 @@ function(ly_enable_gems_delayed)
 
         # apply the list of gem targets.  Adding a gem really just means adding the appropriate dependency.
         foreach(gem_name ${gem_dependencies})
+            # the gem name may already have a namespace.  If it does, we use that one
+            ly_strip_target_namespace(TARGET ${gem_name} OUTPUT_VARIABLE unaliased_gem_name)
+            if (${unaliased_gem_name} STREQUAL ${gem_name})
+                # if stripping a namespace had no effect, it had no namespace
+                # and we supply the default Gem:: namespace.
+                set(gem_name_with_namespace Gem::${gem_name})
+            else()
+                # if stripping the namespace had an effect then we use the original
+                # with the namespace, instead of assuming Gem::
+                set(gem_name_with_namespace ${gem_name})
+            endif()
             
-            if (TARGET Gem::${gem_name}.${variant})
-                ly_add_target_dependencies(
-                    ${PREFIX_CLAUSE}
-                    TARGETS ${target}
-                    DEPENDENT_TARGETS Gem::${gem_name}.${variant}
-                )
-            elseif(${variant} STREQUAL "Client" AND TARGET Gem::${gem_name})
-                # Client can also be 'empty' for backward compatibility
+            # if the target exists, add it.
+            if (TARGET ${gem_name_with_namespace}.${variant})
                 ly_add_target_dependencies(
                     ${PREFIX_CLAUSE}
                     TARGETS ${target}
-                    DEPENDENT_TARGETS Gem::${gem_name}
+                    DEPENDENT_TARGETS ${gem_name_with_namespace}.${variant}
                 )
             endif()
         endforeach()