diff --git a/.github/workflows/sql-pitest.yml b/.github/workflows/sql-pitest.yml
new file mode 100644
index 0000000000..fb23ff829f
--- /dev/null
+++ b/.github/workflows/sql-pitest.yml
@@ -0,0 +1,42 @@
+name: SQL Plugin PiTest
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        required: false
+        type: string
+
+run-name:
+  ${{ inputs.name == '' && format('{0} @ {1}', github.ref_name, github.sha) || inputs.name }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        java:
+          - 11
+          - 17
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+
+    - name: PiTest with Gradle
+      run: |
+        ./gradlew --continue :core:pitest :opensearch:pitest
+
+    - name: Upload test reports
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-reports-${{ matrix.entry.java }}
+        path: |
+          core/build/reports/**
+          opensearch/build/reports/**
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
index 4853e2e1eb..90ada395e2 100644
--- a/.github/workflows/sql-test-and-build-workflow.yml
+++ b/.github/workflows/sql-test-and-build-workflow.yml
@@ -44,12 +44,6 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew --continue build ${{ matrix.entry.os_build_args }}
 
-    - name: PiTest with Gradle
-      run: |
-        ./gradlew :core:pitest
-        ./gradlew :opensearch:pitest
-     
-
     - name: Run backward compatibility tests
       if: ${{ matrix.entry.os == 'ubuntu-latest' }}
       run: ./scripts/bwctest.sh
@@ -63,14 +57,16 @@ jobs:
     - name: Upload SQL Coverage Report
       if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
       uses: codecov/codecov-action@v3
+      continue-on-error: true
       with:
         flags: sql-engine
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
+      continue-on-error: true
       with:
-        name: opensearch-sql-${{ matrix.entry.os }}
+        name: opensearch-sql-${{ matrix.entry.os }}-${{ matrix.entry.java }}
         path: opensearch-sql-builds
 
     - name: Upload test reports
@@ -78,7 +74,7 @@ jobs:
       uses: actions/upload-artifact@v2
       continue-on-error: true
       with:
-        name: test-reports
+        name: test-reports-${{ matrix.entry.os }}-${{ matrix.entry.java }}
         path: |
           sql/build/reports/**
           ppl/build/reports/**
@@ -89,3 +85,5 @@ jobs:
           protocol/build/reports/**
           legacy/build/reports/**
           plugin/build/reports/**
+          doctest/build/testclusters/docTestCluster-0/logs/*
+          integ-test/build/testclusters/*/logs/*
diff --git a/.github/workflows/sql-test-workflow.yml b/.github/workflows/sql-test-workflow.yml
index 150d5be7dc..cdc08c7480 100644
--- a/.github/workflows/sql-test-workflow.yml
+++ b/.github/workflows/sql-test-workflow.yml
@@ -82,7 +82,7 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v2
       with:
-        name: test-reports
+        name: test-reports-${{ matrix.entry.java }}
         path: |
           sql/build/reports/**
           ppl/build/reports/**
@@ -93,3 +93,5 @@ jobs:
           protocol/build/reports/**
           legacy/build/reports/**
           plugin/build/reports/**
+          doctest/build/testclusters/docTestCluster-0/logs/*
+          integ-test/build/testclusters/*/logs/*