diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7c53ab6be..c50ef178b 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -28,27 +28,24 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 20]
-        include:
-          - os: ubuntu-latest
-            java: 17
-            codecov: yes
+        java: [11, 17]
     name: Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: temurin
     - uses: actions/checkout@v4
       with:
         repository: opensearch-project/ml-commons
-        ref: agent_framework_dev
+        ref: feature/agent_framework
     - name: Publish to Maven Local
       run: |
         ./gradlew publishToMavenLocal
     - uses: actions/checkout@v4
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: temurin
     - name: Build and Run Tests
       run: |
           ./gradlew check -x integTest -x yamlRestTest