diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
index 6f8e2a21c963..33c2269fb360 100644
--- a/.github/workflows/sycl-linux-build.yml
+++ b/.github/workflows/sycl-linux-build.yml
@@ -296,6 +296,9 @@ jobs:
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
         cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
+        # This is required to perform the DeviceConfigFile consistency test, see
+        # sycl/test-e2e/Basic/device_config_file_consistency.cpp.
+        cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
     - name: Additional Install for "--shared-libs" build
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
       run: |
diff --git a/buildbot/configure.py b/buildbot/configure.py
index 17200f7d52bd..4dcbd85a355c 100644
--- a/buildbot/configure.py
+++ b/buildbot/configure.py
@@ -66,7 +66,6 @@ def do_configure(args, passthrough_args):
     xpti_enable_werror = "OFF"
     llvm_enable_zstd = "OFF"
     spirv_enable_dis = "OFF"
-    sycl_install_device_config_file = "OFF"
 
     if sys.platform != "darwin":
         # For more info on the enablement of level_zero_v2 refer to this document:
@@ -162,7 +161,6 @@ def do_configure(args, passthrough_args):
                 libclc_targets_to_build += libclc_nvidia_target_names
             libclc_gen_remangled_variants = "ON"
             spirv_enable_dis = "ON"
-            sycl_install_device_config_file = "ON"
 
     if args.enable_backends:
         sycl_enabled_backends += args.enable_backends
@@ -211,7 +209,6 @@ def do_configure(args, passthrough_args):
         "-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
         "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
-        "-DSYCL_INSTALL_DEVICE_CONFIG_FILE={}".format(sycl_install_device_config_file),
     ]
 
     if libclc_enabled:
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
index 20e940fce9f9..4ecf9da2f84d 100644
--- a/sycl/CMakeLists.txt
+++ b/sycl/CMakeLists.txt
@@ -532,11 +532,6 @@ if("hip" IN_LIST SYCL_ENABLE_BACKENDS)
   list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS ur_adapter_hip)
 endif()
 
-if(SYCL_INSTALL_DEVICE_CONFIG_FILE)
-  add_dependencies(sycl-toolchain DeviceConfigFile)
-  list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS DeviceConfigFile)
-endif()
-
 # Use it as fake dependency in order to force another command(s) to execute.
 add_custom_command(OUTPUT __force_it
   COMMAND "${CMAKE_COMMAND}" -E echo