diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bf118078b..fd53ba2c1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,6 +12,8 @@ on:
       - 'pyproject.toml'
       - 'uv.lock'
       - 'mypy_allowlist.txt'
+      - '.github/workflows/ci.yaml'
+      - '.github/actions/**'
   pull_request:
   workflow_dispatch:
 
@@ -366,6 +368,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: |
+            packages/codeflash/package-lock.json
+            code_to_optimize/js/*/package-lock.json
 
       - name: Install codeflash npm package dependencies
         run: |
@@ -452,17 +458,11 @@ jobs:
       - name: Install dependencies
         run: uv sync
 
-      - name: Build codeflash-runtime JAR
+      - name: Build and install codeflash-runtime JAR
         run: |
           cd codeflash-java-runtime
-          mvn clean package -q -DskipTests
           mvn install -q -DskipTests
 
-      - name: Verify Java installation
-        run: |
-          java -version
-          mvn --version
-
       - name: Remove .git
         if: matrix.remove_git
         run: |
diff --git a/.github/workflows/java-e2e-tests.yml b/.github/workflows/java-e2e-tests.yml
deleted file mode 100644
index 0e84aada5..000000000
--- a/.github/workflows/java-e2e-tests.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Java E2E Tests
-
-on:
-  push:
-    branches:
-      - main
-      - omni-java
-    paths:
-      - 'codeflash/languages/java/**'
-      - 'tests/test_languages/test_java*.py'
-      - 'code_to_optimize/java/**'
-      - '.github/workflows/java-e2e-tests.yml'
-  pull_request:
-    paths:
-      - 'codeflash/languages/java/**'
-      - 'tests/test_languages/test_java*.py'
-      - 'code_to_optimize/java/**'
-      - '.github/workflows/java-e2e-tests.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: true
-
-jobs:
-  java-e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: maven
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v8.0.0
-
-      - name: Set up Python environment
-        run: |
-          uv venv --seed
-          uv sync
-
-      - name: Verify Java installation
-        run: |
-          java -version
-          mvn --version
-
-      - name: Build codeflash-runtime JAR
-        run: |
-          cd codeflash-java-runtime
-          mvn clean package -q -DskipTests
-          mvn install -q -DskipTests
-
-      - name: Build Java sample project
-        run: |
-          cd code_to_optimize/java
-          mvn compile -q
-
-      - name: Run Java sample project tests
-        run: |
-          cd code_to_optimize/java
-          mvn test -q
-
-      - name: Run Java E2E tests
-        run: |
-          uv run pytest tests/test_languages/test_java_e2e.py -v --tb=short
-
-      - name: Run Java unit tests
-        run: |
-          uv run pytest tests/test_languages/test_java/ -v --tb=short -x