diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 2b9c5286b..858578cb4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -16,60 +16,34 @@ jobs:
       - uses: actions/checkout@v4
       - name: Spotless Check
         run: ./gradlew spotlessCheck
-  javadoc:
-    if: github.repository == 'opensearch-project/opensearch-ai-flow-framework'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Javadoc CheckStyle
-        run: ./gradlew checkstyleMain
-      - name: Javadoc Check
-        run: ./gradlew javadoc
   build:
-    needs: [spotless, javadoc]
+    needs: [spotless]
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11]
-        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
-    - name: Build and Run Tests
-      run: |
-          ./gradlew check -x integTest -x yamlRestTest
-    - name: Upload Coverage Report
-      if: ${{ matrix.codecov }}
-      uses: codecov/codecov-action@v3
-      with:
-        file: ./build/reports/jacoco/test/jacocoTestReport.xml
-  integTest:
-    needs: [spotless, javadoc]
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11]
-        include:
-          - os: ubuntu-latest
-            java: 17
-    name: Integ 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
-    - name: Build and Run Tests
-      run: |
-          ./gradlew integTest yamlRestTest
+      - 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: feature/agent_framework_dev
+      - name: Publish to Maven Local
+        run: |
+          ./gradlew publishToMavenLocal
+      - uses: actions/checkout@v4
+      - name: Build and Run Tests
+        run: |
+          ./gradlew check
+      - name: Upload Coverage Report
+        if: matrix.os == 'ubuntu-latest'
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./build/reports/jacoco/test/jacocoTestReport.xml