diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index 7da2efaafb..f579f6ed73 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -255,7 +255,7 @@ if(BUILD_WITH_L0)
                    ${NEO_SHARED_DIRECTORY}/dll/wddm/create_gdi.cpp
                    ${NEO_SHARED_DIRECTORY}/dll/wddm/wddm_create.cpp
                    ${NEO_SHARED_DIRECTORY}/dll/windows/debugger_l0_windows.cpp
-                   ${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
+                   ${NEO_SHARED_DIRECTORY}/dll/windows${BRANCH_DIR_SUFFIX}/options_windows.cpp
                    ${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
                    ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
                    ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
@@ -282,7 +282,7 @@ if(BUILD_WITH_L0)
                    ${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
                    ${NEO_SHARED_DIRECTORY}/dll/linux/debugger_l0_dll_linux.cpp
                    ${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
-                   ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
+                   ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
                    ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
                    ${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
     )
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index 311cb993ca..40fee719b8 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable(igdrcl_${target_name}
                ${NEO_SHARED_DIRECTORY}/dll/device_dll.cpp
                ${NEO_SHARED_DIRECTORY}/dll/direct_submission_controller_enabled.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
-               ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
+               ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/command_queue_dll.cpp
                ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt
index 5025532273..e72c7fc1a4 100644
--- a/opencl/test/unit_test/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/windows/CMakeLists.txt
@@ -29,7 +29,7 @@ if(WIN32)
                  ${NEO_SHARED_DIRECTORY}/dll/wddm/wddm_create.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
-                 ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.cpp
+                 ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows${BRANCH_DIR_SUFFIX}/options.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_drm_or_wddm.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls_winmm.cpp
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index 9d16ca0e73..11a31f9061 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -144,7 +144,7 @@ if(WIN32)
        ${NEO_SHARED_DIRECTORY}/ail/windows/ail_configuration_windows.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/windows/compiler_cache_windows.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/windows/os_compiler_cache_helper.cpp
-       ${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
+       ${NEO_SHARED_DIRECTORY}/dll/windows${BRANCH_DIR_SUFFIX}/options_windows.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_inc.h
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
@@ -158,7 +158,7 @@ else()
        ${NEO_SHARED_DIRECTORY}/ail/linux/ail_configuration_linux.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/linux/compiler_cache_linux.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/linux/os_compiler_cache_helper.cpp
-       ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
+       ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_inc.h
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
diff --git a/shared/source/dll/linux/options_linux.cpp b/shared/source/dll/linux/options_linux.cpp
index 62598c0800..eb1918640b 100644
--- a/shared/source/dll/linux/options_linux.cpp
+++ b/shared/source/dll/linux/options_linux.cpp
@@ -1,26 +1,8 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/os_interface/os_library.h"
-
-#include "igc.opencl.h"
-
-namespace Os {
-// Compiler library names
-const char *frontEndDllName = FCL_LIBRARY_NAME;
-const char *igcDllName = IGC_LIBRARY_NAME;
-const char *libvaDllName = "libva.so.2";
-const char *gdiDllName = "/usr/lib/wsl/lib/libdxcore.so";
-const char *dxcoreDllName = "/usr/lib/wsl/lib/libdxcore.so";
-
-const char *sysFsPciPathPrefix = "/sys/bus/pci/devices/";
-const char *pciDevicesDirectory = "/dev/dri/by-path";
-const char *sysFsProcPathPrefix = "/proc";
-
-// Metrics Library name
-const char *metricsLibraryDllName = "libigdml.so.1";
-} // namespace Os
+#include "options_linux.inl"
diff --git a/shared/source/dll/linux/options_linux.inl b/shared/source/dll/linux/options_linux.inl
new file mode 100644
index 0000000000..cce2be8c13
--- /dev/null
+++ b/shared/source/dll/linux/options_linux.inl
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019-2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/os_interface/os_library.h"
+
+#include "igc.opencl.h"
+
+namespace Os {
+// Compiler library names
+const char *frontEndDllName = FCL_LIBRARY_NAME;
+const char *igcDllName = IGC_LIBRARY_NAME;
+const char *libvaDllName = "libva.so.2";
+const char *gdiDllName = "/usr/lib/wsl/lib/libdxcore.so";
+const char *dxcoreDllName = "/usr/lib/wsl/lib/libdxcore.so";
+
+const char *sysFsPciPathPrefix = "/sys/bus/pci/devices/";
+const char *pciDevicesDirectory = "/dev/dri/by-path";
+const char *sysFsProcPathPrefix = "/proc";
+
+// Metrics Library name
+const char *metricsLibraryDllName = "libigdml.so.1";
+} // namespace Os
diff --git a/shared/source/dll/windows/options_windows.cpp b/shared/source/dll/windows/options_windows.cpp
index 18c6d99181..f79c64d287 100644
--- a/shared/source/dll/windows/options_windows.cpp
+++ b/shared/source/dll/windows/options_windows.cpp
@@ -1,23 +1,8 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "igc.opencl.h"
-
-namespace Os {
-
-const char *frontEndDllName = FCL_LIBRARY_NAME;
-const char *igcDllName = IGC_LIBRARY_NAME;
-const char *gdiDllName = "gdi32.dll";
-const char *dxcoreDllName = "dxcore.dll";
-
-// Os specific Metrics Library name
-#if _WIN64
-const char *metricsLibraryDllName = "igdml64.dll";
-#else
-const char *metricsLibraryDllName = "igdml32.dll";
-#endif
-} // namespace Os
+#include "options_windows.inl"
diff --git a/shared/source/dll/windows/options_windows.inl b/shared/source/dll/windows/options_windows.inl
new file mode 100644
index 0000000000..50f0e82623
--- /dev/null
+++ b/shared/source/dll/windows/options_windows.inl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2019-2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "igc.opencl.h"
+
+namespace Os {
+
+const char *frontEndDllName = FCL_LIBRARY_NAME;
+const char *igcDllName = IGC_LIBRARY_NAME;
+const char *gdiDllName = "gdi32.dll";
+const char *dxcoreDllName = "dxcore.dll";
+
+// Os specific Metrics Library name
+#if _WIN64
+const char *metricsLibraryDllName = "igdml64.dll";
+#else
+const char *metricsLibraryDllName = "igdml32.dll";
+#endif
+} // namespace Os
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 0f207d17e0..64cdfa2173 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -205,7 +205,7 @@ set(neo_libult_SRCS_LINUX
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/create_drm_memory_manager.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/drm_memory_manager_fixture.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/drm_neo_create.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/options.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux${BRANCH_DIR_SUFFIX}/options.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_${DRIVER_MODEL}.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/sys_calls_linux_ult.cpp
 )
@@ -216,7 +216,7 @@ set(neo_libult_SRCS_WINDOWS
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/device_ult.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_direct_submission_controller_enabled.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
-    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows${BRANCH_DIR_SUFFIX}/options.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_drm_or_wddm.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls_winmm.cpp
diff --git a/shared/test/common/os_interface/linux/options.cpp b/shared/test/common/os_interface/linux/options.cpp
index 23e33edd73..daaf19eb66 100644
--- a/shared/test/common/os_interface/linux/options.cpp
+++ b/shared/test/common/os_interface/linux/options.cpp
@@ -1,29 +1,8 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "common/gtsysinfo.h"
-#include "igfxfmid.h"
-#include "test_files_setup.h"
-
-namespace Os {
-///////////////////////////////////////////////////////////////////////////////
-// These options determine the Linux specific behavior for
-// the runtime unit tests
-///////////////////////////////////////////////////////////////////////////////
-#if defined(__linux__)
-const char *frontEndDllName = "_invalidFCL";
-const char *igcDllName = "_invalidIGC";
-const char *libvaDllName = nullptr;
-const char *testDllName = "libtest_dynamic_lib.so";
-const char *metricsLibraryDllName = "";
-const char *gdiDllName = "";
-const char *dxcoreDllName = "";
-#endif
-const char *sysFsPciPathPrefix = NEO_SHARED_TEST_FILES_DIR "/linux/devices/";
-const char *pciDevicesDirectory = NEO_SHARED_TEST_FILES_DIR "/linux/by-path";
-const char *sysFsProcPathPrefix = NEO_SHARED_TEST_FILES_DIR "/linux/proc/";
-} // namespace Os
+#include "options.inl"
diff --git a/shared/test/common/os_interface/linux/options.inl b/shared/test/common/os_interface/linux/options.inl
new file mode 100644
index 0000000000..f460c6de28
--- /dev/null
+++ b/shared/test/common/os_interface/linux/options.inl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018-2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "common/gtsysinfo.h"
+#include "igfxfmid.h"
+#include "test_files_setup.h"
+
+namespace Os {
+///////////////////////////////////////////////////////////////////////////////
+// These options determine the Linux specific behavior for
+// the runtime unit tests
+///////////////////////////////////////////////////////////////////////////////
+#if defined(__linux__)
+const char *frontEndDllName = "_invalidFCL";
+const char *igcDllName = "_invalidIGC";
+const char *libvaDllName = nullptr;
+const char *testDllName = "libtest_dynamic_lib.so";
+const char *metricsLibraryDllName = "";
+const char *gdiDllName = "";
+const char *dxcoreDllName = "";
+#endif
+const char *sysFsPciPathPrefix = NEO_SHARED_TEST_FILES_DIR "/linux/devices/";
+const char *pciDevicesDirectory = NEO_SHARED_TEST_FILES_DIR "/linux/by-path";
+const char *sysFsProcPathPrefix = NEO_SHARED_TEST_FILES_DIR "/linux/proc/";
+} // namespace Os
diff --git a/shared/test/common/os_interface/windows/options.cpp b/shared/test/common/os_interface/windows/options.cpp
index d779149aea..daaf19eb66 100644
--- a/shared/test/common/os_interface/windows/options.cpp
+++ b/shared/test/common/os_interface/windows/options.cpp
@@ -1,22 +1,8 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "common/gtsysinfo.h"
-#include "igfxfmid.h"
-
-namespace Os {
-///////////////////////////////////////////////////////////////////////////////
-// These options determine the Windows specific behavior for
-// the runtime unit tests
-///////////////////////////////////////////////////////////////////////////////
-const char *frontEndDllName = "";
-const char *igcDllName = "";
-const char *gdiDllName = "";
-const char *dxcoreDllName = "";
-const char *testDllName = "test_dynamic_lib.dll";
-const char *metricsLibraryDllName = "";
-} // namespace Os
+#include "options.inl"
diff --git a/shared/test/common/os_interface/windows/options.inl b/shared/test/common/os_interface/windows/options.inl
new file mode 100644
index 0000000000..48ec55dfc9
--- /dev/null
+++ b/shared/test/common/os_interface/windows/options.inl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2018-2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "common/gtsysinfo.h"
+#include "igfxfmid.h"
+
+namespace Os {
+///////////////////////////////////////////////////////////////////////////////
+// These options determine the Windows specific behavior for
+// the runtime unit tests
+///////////////////////////////////////////////////////////////////////////////
+const char *frontEndDllName = "";
+const char *igcDllName = "";
+const char *gdiDllName = "";
+const char *dxcoreDllName = "";
+const char *testDllName = "test_dynamic_lib.dll";
+const char *metricsLibraryDllName = "";
+} // namespace Os