diff --git a/.github/workflows/ON-BOARDING-NEW-BRANCH.yml b/.github/workflows/ON-BOARDING-NEW-BRANCH.yml
index eebaef9c6..b21d4c8b9 100644
--- a/.github/workflows/ON-BOARDING-NEW-BRANCH.yml
+++ b/.github/workflows/ON-BOARDING-NEW-BRANCH.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch
 jobs:
   Checkout:
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -12,10 +12,14 @@ jobs:
 
   CREATE-PR:
     needs: Checkout
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Create GenAI Branch and PR
     steps:
       - id: maximus-create-pr-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/create-pr@feature/genai_ut_eval_release
+        run: |
+          cd  ../../../genai_ut_gen
+          git pull
+          cp /home/runner/scripts/.env .
+          python create_pr.py
     env:
       GITHUB_CONTEXT: ${{ toJson(github) }}
diff --git a/.github/workflows/UNIT-TEST-GEN-ALL.yml b/.github/workflows/UNIT-TEST-GEN-ALL.yml
index a194ed404..ba9c52e30 100644
--- a/.github/workflows/UNIT-TEST-GEN-ALL.yml
+++ b/.github/workflows/UNIT-TEST-GEN-ALL.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   Checkout:
     if: startsWith(github.ref, 'refs/heads/NEX_MAXIMUS_UT/')
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -14,35 +14,50 @@ jobs:
 
   CREATE-USER-RUN-ENV:
     needs: Checkout
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Create User Run Environment
     steps:
       - id: maximus-create-env-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/create-env@feature/genai_ut_eval_release
+        run: |
+          cd ../../../genai_ut_gen
+          git pull 
+          bash ./create_user_env.sh
     env:
       # <Input relative filepath of your requirements.txt path i.e. dir-name/requirements.txt >
       REQUIREMENTS_PATH: requirements.txt
 
   GENAI-UNIT-TEST-GENERATE:
     needs: CREATE-USER-RUN-ENV
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Generate Unit Tests using GenAI
     steps:
       - id: maximus-ut-gen-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/unit-test@feature/genai_ut_eval_release
+        run: |
+          cd ../../../genai_ut_gen
+          git pull 
+          cp /home/runner/scripts/.env .
+          chmod +x ./get_unittest_details.sh
+          ./get_unittest_details.sh
     env:
+      GITHUB_CONTEXT: ${{ toJson(github) }}
       TASK_TYPE: generate
       # INCLUDE_PATHS: <Include your paths here if want to generate UT on specific files/dirs>
       # EXCLUDE_PATHS: <Exclude your paths here if want to exclude specific files/dirs>
 
   UNIT-TEST-RUN:
     needs: GENAI-UNIT-TEST-GENERATE
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Run Unit Tests
     steps:
       - id: maximus-ut-run-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/unit-test@feature/genai_ut_eval_release
+        run: |
+          cd ../../../genai_ut_gen
+          git pull 
+          cp /home/runner/scripts/.env .
+          chmod +x ./get_unittest_details.sh
+          ./get_unittest_details.sh
     env:
+      GITHUB_CONTEXT: ${{ toJson(github) }}
       TASK_TYPE: run
       # INCLUDE_PATHS: <Include your paths here if want to run UT on specific files/dirs>
       # EXCLUDE_PATHS: <Exclude your paths here if want to exclude specific files/dirs>
diff --git a/.github/workflows/UNIT-TEST-RUN-WORKFLOW-DISPATCH.yml b/.github/workflows/UNIT-TEST-RUN-WORKFLOW-DISPATCH.yml
index cc12622a4..9ca75db4a 100644
--- a/.github/workflows/UNIT-TEST-RUN-WORKFLOW-DISPATCH.yml
+++ b/.github/workflows/UNIT-TEST-RUN-WORKFLOW-DISPATCH.yml
@@ -4,7 +4,7 @@ on:
 jobs:
   Checkout:
     if: startsWith(github.ref, 'refs/heads/NEX_MAXIMUS_UT/')
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -13,23 +13,33 @@ jobs:
 
   CREATE-USER-RUN-ENV:
     needs: Checkout
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Create User Run Environment
     steps:
       - id: maximus-create-env-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/create-env@feature/genai_ut_eval_release
+        run: |
+          cd ../../../genai_ut_gen
+          git pull 
+          bash ./create_user_env.sh
     env:
+      GITHUB_CONTEXT: ${{ toJson(github) }}
       # <Input relative filepath of your requirements.txt path i.e. dir-name/requirements.txt >
       REQUIREMENTS_PATH: requirements.txt
 
   UNIT-TEST-RUN:
     needs: CREATE-USER-RUN-ENV
-    runs-on: [self-hosted, maximus-unit-test]
+    runs-on: [self-hosted, maximus-unit-test-os]
     name: Run Unit Tests
     steps:
       - id: genai-maximus-action
-        uses: intel-innersource/frameworks.actions.maximus.genai-gpt/unit-test@feature/genai_ut_eval_release
+        run: |
+          cd ../../../genai_ut_gen
+          git pull 
+          cp /home/runner/scripts/.env .
+          chmod +x ./get_unittest_details.sh
+          ./get_unittest_details.sh
     env:
+      GITHUB_CONTEXT: ${{ toJson(github) }}
       TASK_TYPE: run
       # INCLUDE_PATHS: <Include your paths here if want to run UT on specific files/dirs>
       # EXCLUDE_PATHS: <Exclude your paths here if want to exclude specific files/dirs>