diff --git a/Ref/Top/instances.fpp b/Ref/Top/instances.fpp
index dc1ed382cfa..52ccb842a2e 100644
--- a/Ref/Top/instances.fpp
+++ b/Ref/Top/instances.fpp
@@ -113,9 +113,7 @@ module Ref {
   # ----------------------------------------------------------------------
 
   @ Communications driver. May be swapped with other comm drivers like UART
-  instance comDriver: Drv.TcpClient base id 0x4000
-
-  instance fatalHandler: Svc.FatalHandler base id 0x4100
+  instance comDriver: Drv.TcpClient base id 0x4100
 
   instance commsBufferManager: Svc.BufferManager base id 0x4200
 
diff --git a/Ref/Top/topology.fpp b/Ref/Top/topology.fpp
index c4d50933154..43392ff26bd 100644
--- a/Ref/Top/topology.fpp
+++ b/Ref/Top/topology.fpp
@@ -66,7 +66,6 @@ module Ref {
     instance dpWriter
     instance dpBufferManager
     instance linuxTimer
-    instance fatalHandler
 
     # ----------------------------------------------------------------------
     # Pattern graph specifiers
@@ -222,10 +221,6 @@ module Ref {
 
     }
 
-    connections FaultProtection {
-        CDHCore.events.FatalAnnounce -> fatalHandler.FatalReceive
-    }
-
   }
 
 }
\ No newline at end of file
diff --git a/Svc/Subtopologies/CDHCore/CDHCore.fpp b/Svc/Subtopologies/CDHCore/CDHCore.fpp
index b362379b9ad..a778fd72d70 100644
--- a/Svc/Subtopologies/CDHCore/CDHCore.fpp
+++ b/Svc/Subtopologies/CDHCore/CDHCore.fpp
@@ -61,6 +61,11 @@ module CDHCore {
         instance version
         instance textLogger
         instance fatalAdapter
+        instance fatalHandler
 
+        connections FaultProtection {
+            events.FatalAnnounce -> fatalHandler.FatalReceive
+        }
+        
     } # end topology
 } # end CDHCore Subtopology
\ No newline at end of file
diff --git a/Svc/Subtopologies/CDHCore/CDHCoreConfig/CDHCoreConfig.fpp b/Svc/Subtopologies/CDHCore/CDHCoreConfig/CDHCoreConfig.fpp
index 265cb98aab2..c08b0c37ba3 100644
--- a/Svc/Subtopologies/CDHCore/CDHCoreConfig/CDHCoreConfig.fpp
+++ b/Svc/Subtopologies/CDHCore/CDHCoreConfig/CDHCoreConfig.fpp
@@ -50,5 +50,7 @@ module CDHCore {
     #    """
     #}
 
+    # Update this as a custom fatal handler if needed
+    instance fatalHandler: Svc.FatalHandler base id CDHCoreConfig.BASE_ID + 0x0800
 
 }
\ No newline at end of file
diff --git a/cmake/test/data/TestDeployment/CMakeLists.txt b/cmake/test/data/TestDeployment/CMakeLists.txt
index 048d6c6f784..c059d3b1af8 100644
--- a/cmake/test/data/TestDeployment/CMakeLists.txt
+++ b/cmake/test/data/TestDeployment/CMakeLists.txt
@@ -31,5 +31,4 @@ add_fprime_subdirectory(./TestRelative)
 
 set(SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Main.cpp")
 set(MOD_DEPS  Svc_CmdDispatcher TestLibrary_TestComponent TestLibrary2_TestComponent)
-register_fprime_deployment()
-add_dependencies(TestDeployment Svc_Subtopologies_CDHCore)
\ No newline at end of file
+register_fprime_deployment()
\ No newline at end of file