diff --git a/Gems/Atom/RHI/Null/Code/CMakeLists.txt b/Gems/Atom/RHI/Null/Code/CMakeLists.txt
index 1b88e72648..be1c5d22aa 100644
--- a/Gems/Atom/RHI/Null/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Null/Code/CMakeLists.txt
@@ -89,7 +89,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
    ly_add_target(
-        NAME Atom_RHI_Null.Builders MODULE
+        NAME Atom_RHI_Null.Builders GEM_MODULE
         NAMESPACE Gem
         FILES_CMAKE
             atom_rhi_null_builders_shared_files.cmake
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
index 06b4e2a7fe..33873e0dfa 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
@@ -104,14 +104,5 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             Gem::ImguiAtom
             Gem::AtomFont
             Gem::AtomToolsFramework.Editor
-            
-            # Testing jenkins issue
-            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
-            Gem::Atom_RHI_Metal.Builders
     )
 endif()