diff --git a/.github/workflows/_get-test-matrix.yml b/.github/workflows/_get-test-matrix.yml
index deedaa949..301835fc8 100644
--- a/.github/workflows/_get-test-matrix.yml
+++ b/.github/workflows/_get-test-matrix.yml
@@ -25,7 +25,6 @@ jobs:
           else
             echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV
           fi
-          echo "checkout ref ${{ env.CHECKOUT_REF }}"
 
       - name: Checkout out Repo
         uses: actions/checkout@v4
@@ -39,7 +38,7 @@ jobs:
           set -xe
           if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
             LATEST_COMMIT_SHA=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            "https://api.github.com/repos/opea-project/GenAIComps/commits?sha=main" | jq -r '.[0].sha')
+            "https://api.github.com/repos/opea-project/GenAIComps/commits?sha=${{ github.event.pull_request.base.ref }}" | jq -r '.[0].sha')
             echo "Latest commit SHA is $LATEST_COMMIT_SHA"
             base_commit=$LATEST_COMMIT_SHA
           else
diff --git a/.github/workflows/pr-examples-test.yml b/.github/workflows/pr-examples-test.yml
index a3eb50539..e3fe2b6ab 100644
--- a/.github/workflows/pr-examples-test.yml
+++ b/.github/workflows/pr-examples-test.yml
@@ -52,11 +52,10 @@ jobs:
           cat test_chatqna_on_gaudi.sh
 
           echo "Run test..."
+          echo "LOG_DIR=$(pwd)" >> $GITHUB_ENV
           export IMAGE_TAG="comps"
           timeout 50m bash test_chatqna_on_gaudi.sh
 
-          echo "LOG_PATH=$(pwd)/*.log" >> $GITHUB_ENV
-
       - name: Clean up container
         if: cancelled() || failure()
         run: |
@@ -69,4 +68,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "Examples-Test-Logs"
-          path: ${{ env.LOG_PATH }}
+          path: ${{ env.LOG_DIR }}/*.log
diff --git a/.github/workflows/pr-microservice-test.yml b/.github/workflows/pr-microservice-test.yml
index f9dd45d8f..786b887c5 100644
--- a/.github/workflows/pr-microservice-test.yml
+++ b/.github/workflows/pr-microservice-test.yml
@@ -5,7 +5,7 @@ name: MicroService-test
 
 on:
   pull_request_target:
-    branches: [main]
+    branches: ["main", "*rc"]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
       - comps/**