diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index f621ba4c6..54170c5e5 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -61,14 +61,6 @@ NVGPU_COMMON_CFLAGS		+=		\
 	-DCONFIG_TEGRA_GR_VIRTUALIZATION	\
 	-DCONFIG_PCI_MSI
 
-# Enable debugger APIs for safety build until devctl whitelisting is done
-CONFIG_NVGPU_DEBUGGER           := 1
-NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_DEBUGGER
-
-# Enable CILP preemption for safety build until devctl whitelisting is done
-CONFIG_NVGPU_CILP               := 1
-NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_CILP
-
 # Enable Channel WDT for safety build until we switch to user mode submits only
 NVGPU_COMMON_CFLAGS		+= -DCONFIG_NVGPU_CHANNEL_WDT
 
@@ -130,6 +122,12 @@ NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_ACR_LEGACY
 CONFIG_NVGPU_ENGINE_QUEUE       := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_ENGINE_QUEUE
 
+CONFIG_NVGPU_DEBUGGER           := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_DEBUGGER
+
+CONFIG_NVGPU_CILP               := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_CILP
+
 CONFIG_NVGPU_CYCLESTATS         := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_CYCLESTATS