diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 25c36752..e27b341f 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -359,21 +359,3 @@ powershare {
         },
     },
 }
-
-// NVIDIA specific config modules
-soong_config_module_type {
-    name: "nvidia_enhancements",
-    module_type: "cc_defaults",
-    config_namespace: "lineageNvidiaVars",
-    bool_variables: ["uses_nvidia_enhancements"],
-    properties: ["cppflags"],
-}
-
-nvidia_enhancements {
-    name: "nvidia_enhancements_defaults",
-    soong_config_variables: {
-        uses_nvidia_enhancements: {
-            cppflags: ["-DNV_ANDROID_FRAMEWORK_ENHANCEMENTS"],
-        },
-    },
-}
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 36c20a76..b37edb63 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -57,17 +57,12 @@ SOONG_CONFIG_lineageGlobalVars += \
     target_health_charging_control_charging_path
 endif
 
-SOONG_CONFIG_NAMESPACES += lineageNvidiaVars
-SOONG_CONFIG_lineageNvidiaVars += \
-    uses_nvidia_enhancements
-
 # Soong bool variables
 SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)
 SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT)
 SOONG_CONFIG_lineageGlobalVars_uses_egl_display_array := $(TARGET_USES_EGL_DISPLAY_ARRAY)
-SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
 
 # Set default values
 BOOTLOADER_MESSAGE_OFFSET ?= 0
diff --git a/product/nvidia.mk b/product/nvidia.mk
index 5ae815d0..ba3d5a5c 100644
--- a/product/nvidia.mk
+++ b/product/nvidia.mk
@@ -16,3 +16,4 @@
 # Includes support for:
 # 1) NvCPL / Application Profiles
 NV_ANDROID_FRAMEWORK_ENHANCEMENTS := true
+$(call soong_config_set,NV_ANDROID,FRAMEWORK_ENHANCEMENTS,true)