diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index 1b923e89a8..0298b5fc76 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   format:
-    runs-on: hip-clr-dev1
+    runs-on: AMD-ROCm-Internal-dev1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -19,4 +19,4 @@ jobs:
         id: clang-format
         run: |
           chmod +x .github/hooks/clang-format-check.sh
-          ./.github/hooks/clang-format-check.sh --range "${{ github.event.pull_request.base.sha }}..${{ github.sha }}"
+          ./.github/hooks/clang-format-check.sh --range "${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}"
diff --git a/.github/workflows/keyword-check.yml b/.github/workflows/keyword-check.yml
index b177ae4bff..12108cee14 100644
--- a/.github/workflows/keyword-check.yml
+++ b/.github/workflows/keyword-check.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   check-keywords:
-    runs-on: hip-clr-dev1
+    runs-on: AMD-ROCm-Internal-dev1
     env:
       KEYWORDS: ${{ vars.KEYWORDS }}
 
diff --git a/.github/workflows/pr-title-validate.yml b/.github/workflows/pr-title-validate.yml
index caf49ee6aa..f68440d948 100644
--- a/.github/workflows/pr-title-validate.yml
+++ b/.github/workflows/pr-title-validate.yml
@@ -21,7 +21,7 @@ jobs:
           fi
 
   validate-commit-messages:
-    runs-on: hip-clr-dev1
+    runs-on: AMD-ROCm-Internal-dev1
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
diff --git a/.github/workflows/validate-pr-description.yml b/.github/workflows/validate-pr-description.yml
index 63c0fb87e7..d9b12b4ba6 100644
--- a/.github/workflows/validate-pr-description.yml
+++ b/.github/workflows/validate-pr-description.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   validate-pr-description:
-    runs-on: hip-clr-dev1
+    runs-on: AMD-ROCm-Internal-dev1
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4