diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
index 275bb0ba9f..66c96eb4c6 100644
--- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
+++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
@@ -35,7 +35,7 @@ ly_add_target(
             AZ::AzToolsFramework
             Legacy::CryCommon
             Legacy::EditorLib
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Editor
 )
 
 ly_add_dependencies(Editor ComponentEntityEditorPlugin)
@@ -65,7 +65,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 AZ::AzToolsFrameworkTestCommon
                 Legacy::CryCommon
                 Legacy::EditorLib
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor
     )
     ly_add_googletest(
         NAME Legacy::ComponentEntityEditorPlugin.Tests
diff --git a/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt b/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
index 551f76da02..57b6824060 100644
--- a/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
+++ b/Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
@@ -23,7 +23,7 @@ ly_add_target(
         PUBLIC
             AZ::AzCore
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
 )
 
 ly_add_target(
diff --git a/Gems/EMotionFX/Code/CMakeLists.txt b/Gems/EMotionFX/Code/CMakeLists.txt
index b90902a948..8f0957a280 100644
--- a/Gems/EMotionFX/Code/CMakeLists.txt
+++ b/Gems/EMotionFX/Code/CMakeLists.txt
@@ -36,7 +36,7 @@ ly_add_target(
             AZ::AzCore
             AZ::AzFramework
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
         PUBLIC
             AZ::AtomCore
             Gem::Atom_RPI.Public
diff --git a/Gems/FastNoise/Code/CMakeLists.txt b/Gems/FastNoise/Code/CMakeLists.txt
index a49126303a..0f7a92e8d9 100644
--- a/Gems/FastNoise/Code/CMakeLists.txt
+++ b/Gems/FastNoise/Code/CMakeLists.txt
@@ -23,7 +23,7 @@ ly_add_target(
         PUBLIC
             Legacy::CryCommon
             Gem::GradientSignal
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
 )
 
 ly_add_target(
diff --git a/Gems/GradientSignal/Code/CMakeLists.txt b/Gems/GradientSignal/Code/CMakeLists.txt
index 7b8c9813e6..f7f8571beb 100644
--- a/Gems/GradientSignal/Code/CMakeLists.txt
+++ b/Gems/GradientSignal/Code/CMakeLists.txt
@@ -22,7 +22,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PUBLIC
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
             Gem::SurfaceData
             Gem::ImageProcessingAtom.Headers
 )
@@ -67,7 +67,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 3rdParty::Qt::Widgets
                 Legacy::CryCommon
                 AZ::AzToolsFramework
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor
                 Gem::SurfaceData
                 AZ::AssetBuilderSDK
                 Gem::GradientSignal.Static
diff --git a/Gems/ImGui/Code/CMakeLists.txt b/Gems/ImGui/Code/CMakeLists.txt
index 2f7d6c6ce7..0751c5825b 100644
--- a/Gems/ImGui/Code/CMakeLists.txt
+++ b/Gems/ImGui/Code/CMakeLists.txt
@@ -70,7 +70,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PUBLIC
             Gem::ImGui.ImGuiLYUtils
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
 )
 
 ly_add_target(
diff --git a/Gems/LandscapeCanvas/Code/CMakeLists.txt b/Gems/LandscapeCanvas/Code/CMakeLists.txt
index e8e2fce689..497c83845f 100644
--- a/Gems/LandscapeCanvas/Code/CMakeLists.txt
+++ b/Gems/LandscapeCanvas/Code/CMakeLists.txt
@@ -35,7 +35,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 Legacy::CryCommon
                 Legacy::Editor.Headers
                 Legacy::EditorCommon
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor
                 Gem::GraphCanvasWidgets
                 Gem::GraphModel.Editor.Static
                 Gem::GradientSignal.Editor
diff --git a/Gems/LyShine/Code/CMakeLists.txt b/Gems/LyShine/Code/CMakeLists.txt
index 732bd1cfd4..d9f011750e 100644
--- a/Gems/LyShine/Code/CMakeLists.txt
+++ b/Gems/LyShine/Code/CMakeLists.txt
@@ -26,13 +26,13 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Legacy::CryCommon
-            Gem::LmbrCentral
-            Gem::TextureAtlas
         PUBLIC
             Gem::Atom_RPI.Public
             Gem::Atom_Utils.Static
             Gem::Atom_Bootstrap.Headers
             Gem::AtomFont
+            Gem::LmbrCentral.Static
+            Gem::TextureAtlas
 )
 
 ly_add_target(
@@ -49,8 +49,6 @@ ly_add_target(
         PRIVATE
             Gem::LyShine.Static
             Legacy::CryCommon
-            Gem::LmbrCentral
-            Gem::TextureAtlas
     RUNTIME_DEPENDENCIES
         Gem::LmbrCentral
         Gem::TextureAtlas
@@ -85,7 +83,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Legacy::EditorCore
                 Gem::LyShine.Static
                 Legacy::CryCommon
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor.Static
                 Gem::TextureAtlas
                 Gem::AtomToolsFramework.Static
                 Gem::AtomToolsFramework.Editor
@@ -117,7 +115,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Legacy::CryCommon
                 AZ::AssetBuilderSDK
                 Gem::LyShine.Editor.Static
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor
                 Gem::TextureAtlas
         RUNTIME_DEPENDENCIES
             Gem::LmbrCentral.Editor
@@ -175,7 +173,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzTest
                     Legacy::CryCommon
                     AZ::AssetBuilderSDK
-                    Gem::LmbrCentral
+                    Gem::LmbrCentral.Editor
                     Gem::TextureAtlas
                     Gem::LyShine.Editor.Static
         )
diff --git a/Gems/LyShineExamples/Code/CMakeLists.txt b/Gems/LyShineExamples/Code/CMakeLists.txt
index 372bfa948b..1b8393a806 100644
--- a/Gems/LyShineExamples/Code/CMakeLists.txt
+++ b/Gems/LyShineExamples/Code/CMakeLists.txt
@@ -22,7 +22,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PUBLIC
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
             Gem::LyShine.Static
 )
 
@@ -39,4 +39,6 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Gem::LyShineExamples.Static
+    RUNTIME_DEPENDENCIES
+        Gem::LmbrCentral
 )
diff --git a/Gems/Maestro/Code/CMakeLists.txt b/Gems/Maestro/Code/CMakeLists.txt
index fe58ba03a6..f21badab80 100644
--- a/Gems/Maestro/Code/CMakeLists.txt
+++ b/Gems/Maestro/Code/CMakeLists.txt
@@ -22,7 +22,6 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Legacy::CryCommon
-            Gem::LmbrCentral
 )
 
 ly_add_target(
@@ -39,7 +38,6 @@ ly_add_target(
         PRIVATE
             Legacy::CryCommon
             Gem::Maestro.Static
-            Gem::LmbrCentral
     RUNTIME_DEPENDENCIES
         Gem::LmbrCentral
 )
@@ -69,7 +67,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::AzToolsFramework
                 AZ::AssetBuilderSDK
                 Gem::Maestro.Static
-                Gem::LmbrCentral
         RUNTIME_DEPENDENCIES
             Gem::LmbrCentral.Editor
     )
diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index b4c7b580a6..4ebb32b977 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -46,7 +46,7 @@ ly_add_target(
             AZ::AzCore
             AZ::AzFramework
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
 )
 
 ly_add_target(
@@ -107,7 +107,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::SceneCore
                 AZ::SceneData
                 Legacy::CryCommon
-                Gem::LmbrCentral
+                Gem::LmbrCentral.Editor.Static
                 Gem::PhysX.NumericalMethods
                 Gem::PhysX.Static
                 Gem::AtomLyIntegration_CommonFeatures.Static
diff --git a/Gems/StartingPointCamera/Code/CMakeLists.txt b/Gems/StartingPointCamera/Code/CMakeLists.txt
index d6dd1a7038..b32e713d4a 100644
--- a/Gems/StartingPointCamera/Code/CMakeLists.txt
+++ b/Gems/StartingPointCamera/Code/CMakeLists.txt
@@ -23,7 +23,7 @@ ly_add_target(
         PRIVATE
             AZ::AzCore
             Gem::CameraFramework.Static
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
             Legacy::CryCommon
 )
 
diff --git a/Gems/SurfaceData/Code/CMakeLists.txt b/Gems/SurfaceData/Code/CMakeLists.txt
index de1aa51938..c45c7aa09b 100644
--- a/Gems/SurfaceData/Code/CMakeLists.txt
+++ b/Gems/SurfaceData/Code/CMakeLists.txt
@@ -25,7 +25,7 @@ ly_add_target(
         PUBLIC
             Gem::Atom_RPI.Public
             Gem::Atom_Feature_Common.Static
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
 )
 
 ly_add_target(
diff --git a/Gems/Vegetation/Code/CMakeLists.txt b/Gems/Vegetation/Code/CMakeLists.txt
index c4a003bb4a..2dfbd96d60 100644
--- a/Gems/Vegetation/Code/CMakeLists.txt
+++ b/Gems/Vegetation/Code/CMakeLists.txt
@@ -26,7 +26,7 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PUBLIC
             Legacy::CryCommon
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Static
             Gem::GradientSignal
             Gem::SurfaceData.Static
             Gem::AtomLyIntegration_CommonFeatures.Static