diff --git a/.github/workflows/_linux_ut.yml b/.github/workflows/_linux_ut.yml
index 63dd2248e..2827a0420 100644
--- a/.github/workflows/_linux_ut.yml
+++ b/.github/workflows/_linux_ut.yml
@@ -33,7 +33,10 @@ on:
 jobs:
   Torch-XPU-UT-Tests:
     runs-on: ${{ inputs.runner }} 
-    timeout-minutes: 900
+    timeout-minutes: 9000
+    env:
+      USE_STATIC_MKL: 1
+      ZE_AFFINITY_MASK: 0
     steps:
       - name: Checkout torch-xpu-ops
         uses: actions/checkout@v4
@@ -67,6 +70,7 @@ jobs:
           cd ../pytorch
           pip install -r requirements.txt
           export USE_XPU=1
+          export _GLIBCXX_USE_CXX11_ABI=1
           source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh
           export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
           WERROR=1 python setup.py bdist_wheel
diff --git a/.github/workflows/nightly_ondemand.yml b/.github/workflows/nightly_ondemand.yml
index 1a663661e..2264d9ee8 100644
--- a/.github/workflows/nightly_ondemand.yml
+++ b/.github/workflows/nightly_ondemand.yml
@@ -9,7 +9,7 @@ on:
       pytorch:
         required: false
         type: string
-        default: 'main'
+        default: 'gh/guangyey/48/orig'
         description: Pytorch branch/commit
       keep_torch_xpu_ops:
         required: false
@@ -19,7 +19,7 @@ on:
       ut:
         required: false
         type: string
-        default: 'torch_xpu'
+        default: 'op_example,op_extended,op_ut,torch_xpu'
         description: UT scope. `op_example,op_extended,op_ut,torch_xpu`. Delimiter is comma
       triton:
         required: false
@@ -72,18 +72,19 @@ jobs:
       ut: ${{ github.event_name == 'schedule' && 'op_example,op_extended,op_ut,torch_xpu' || inputs.ut }}
       pytorch: ${{ github.event_name == 'schedule' && 'main' || inputs.pytorch }}
       python: ${{ github.event_name == 'schedule' && '3.10' || inputs.python }}
-      runner: linux.idc.xpu
+      runner: e2e_internal
 
   Linux-Nightly-Ondemand-E2E-Tests:
-    runs-on: pvc_e2e
+    runs-on: e2e_internal
     # Don't run on forked repos
     if: github.repository_owner == 'intel'
-    timeout-minutes: 900
+    timeout-minutes: 9000
     env:
       pytorch: ${{ github.event_name == 'schedule' && 'main' || inputs.pytorch }}
       keep_torch_xpu_ops: ${{ github.event_name == 'schedule' && 'false' || inputs.keep_torch_xpu_ops }}
       ut: ${{ github.event_name == 'schedule' && 'op_example,op_extended,op_ut,torch_xpu' || inputs.ut }}
       python: ${{ github.event_name == 'schedule' && '3.10' || inputs.python }}
+      USE_STATIC_MKL: 1
     outputs:
       TORCH_BRANCH_ID: ${{ steps.pinned.outputs.TORCH_BRANCH_ID }}
       TORCH_COMMIT_ID: ${{ steps.pinned.outputs.TORCH_COMMIT_ID }}
@@ -165,6 +166,7 @@ jobs:
           cd ../pytorch
           pip install -r requirements.txt
           export USE_XPU=1
+          export _GLIBCXX_USE_CXX11_ABI=1
           source /opt/intel/oneapi/pytorch-gpu-dev-0.5/oneapi-vars.sh
           export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
           python setup.py bdist_wheel
@@ -245,7 +247,7 @@ jobs:
       
   Tests-Failure-And-Report:
     if: always()
-    runs-on: pvc_e2e
+    runs-on: e2e_internal
     permissions:
       issues: write
     env: