diff --git a/.github/workflows/build_gpu-fs-sim.yml b/.github/workflows/build_gpu-fs-sim.yml
index 68164bdfc..85542d0b8 100644
--- a/.github/workflows/build_gpu-fs-sim.yml
+++ b/.github/workflows/build_gpu-fs-sim.yml
@@ -12,10 +12,11 @@ on:
     inputs:
       ref:
         type: string
+
 jobs:
   build:
     if: github.repository == 'intel-innersource/frameworks.ai.mlir.mlir-extensions'
-    runs-on: [self-hosted, icx, fs-sim-2]
+    runs-on: [self-hosted, icx, fs-sim]
     timeout-minutes: 450
 
     env:
diff --git a/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp b/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
index 3a193f91e..e7470a16e 100644
--- a/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
+++ b/lib/ExecutionEngine/LEVELZERORUNTIME/LevelZeroRuntimeWrappers.cpp
@@ -405,7 +405,6 @@ static ze_module_handle_t loadModule(GPUL0QUEUE *queue, const void *data,
     build_flags += "-doubleGRF -Xfinalizer -noLocalSplit -Xfinalizer "
                    "-DPASTokenReduction -Xfinalizer -SWSBDepReduction "
                    "-Xfinalizer -printregusage -Xfinalizer -enableBCR";
-    ;
   }
 
   desc.format = ZE_MODULE_FORMAT_IL_SPIRV;
diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
index aac26db4d..1040bcc29 100644
--- a/test/lit.site.cfg.py.in
+++ b/test/lit.site.cfg.py.in
@@ -69,18 +69,20 @@ if config.imex_enable_igpu:
         config.igpu_fp64 = "--no-igpu-fp64"
 if config.imex_enable_fs_simulator:
     config.environment.update({
-        "ForceBCSForInternalCopyEngine": "1",
-        "ForceBcsEngineIndex": "1",
+        "TbxPort": "1234",
         "ForceDeviceId": "0B73",
         "HardwareInfoOverride": "1x4x8",
-        "IGC_Disable512GRFISA": "0",
         "NEOReadDebugKeys": "1",
-        "OverrideSlmSize": "320",
         "PrintDebugSettings": "1",
         "ProductFamilyOverride": "fcs",
         "RebuildPrecompiledKernels": "1",
         "SetCommandStreamReceiver": "2",
-        "TbxPort": "1234",
+        "ZE_FLAT_DEVICE_HIERARCHY": "COMPOSITE",
+        "GLIBC_TUNABLES": "glibc.cpu.hwcaps=-AVX2",
+        "BlitterEnableMaskOverride": "6",
+        "EnableDirectSubmission": "0",
+        "IMEX_ENABLE_LARGE_REG_FILE": "1",
+        "Enable64BitAddressing": "1",
     })
 
 config.imex_runner_utils = os.path.normpath(os.path.join(config.imex_lib_dir, config.shlib_prefix + "imex_runner_utils" + config.llvm_shlib_ext))