diff --git a/Gems/AtomContent/CMakeLists.txt b/Gems/AtomContent/CMakeLists.txt
index f16436c159..bf3ce03fee 100644
--- a/Gems/AtomContent/CMakeLists.txt
+++ b/Gems/AtomContent/CMakeLists.txt
@@ -6,3 +6,7 @@
 #
 add_subdirectory(ReferenceMaterials)
 add_subdirectory(Sponza)
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_create_alias(NAME AtomContent.Builders NAMESPACE Gem TARGETS Gem::AtomContent_ReferenceMaterials.Builders Gem::AtomContent_Sponza.Builders)
+endif()
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt b/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
index d42a283eea..3b936f7644 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
@@ -57,5 +57,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             PRIVATE
                 AZ::AzCore
                 Gem::EMotionFX_Atom.Static
+        RUNTIME_DEPENDENCIES
+            Gem::EMotionFX.Editor
     )
 endif()