diff --git a/media_driver/cmake/linux/media_feature_flags_linux.cmake b/media_driver/cmake/linux/media_feature_flags_linux.cmake
index 7b72c82f774..acbe7ad249f 100644
--- a/media_driver/cmake/linux/media_feature_flags_linux.cmake
+++ b/media_driver/cmake/linux/media_feature_flags_linux.cmake
@@ -18,6 +18,8 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
+option (ENABLE_NEW_KMD "Enable NEW Linux KMD header files" ON)
+
 # global flag for encode AVC_VME/HEVC_VME/MPEG2/VP8
 bs_set_if_undefined(Encode_VME_Supported "yes")
 # global flag for encode AVC_VDENC/HEVC_VDENC/VP9_VDENC/JPEG
diff --git a/media_softlet/linux/common/os/media_srcs.cmake b/media_softlet/linux/common/os/media_srcs.cmake
index b15722c4db6..d6fc5cdb52e 100644
--- a/media_softlet/linux/common/os/media_srcs.cmake
+++ b/media_softlet/linux/common/os/media_srcs.cmake
@@ -24,13 +24,10 @@ if(NOT CMAKE_WDDM_LINUX)
 
 media_include_subdirectory(i915)
 
-if(NOT ENABLE_PRODUCTION_KMD)
-    if(ENABLE_NEW_KMD)
-        media_include_subdirectory(xe)
-    endif()
+if(ENABLE_NEW_KMD)
+    media_include_subdirectory(xe)
 endif()
 
-
 if(ENABLE_PRODUCTION_KMD)
     media_include_subdirectory(i915_production)
 endif()