diff --git a/.github/workflows/global-ci.yaml b/.github/workflows/global-ci.yaml
index bf32b7e..cc8d150 100644
--- a/.github/workflows/global-ci.yaml
+++ b/.github/workflows/global-ci.yaml
@@ -8,11 +8,15 @@ jobs:
     runs-on: ubuntu-24.04
     outputs:
       api_tests_ref: ${{ steps.extract_info.outputs.API_TESTS_REF }}
+      operator_tag: ${{ steps.extract_info.outputs.OPERATOR_TAG }}
+      tag: ${{ steps.extract_info.outputs.TAG }}
     strategy:
       fail-fast: false
     steps:
     - name: Extract pull request number from PR description
       id: extract_info
+      env:
+        GH_TOKEN: ${{ github.token }}
       run: |
         ANALYZER_PR=$(echo "${{ github.event.pull_request.body }}" | grep -oP '[A|a]nalyzer.?[P|p][R|r]: \K\d+' || true)
         if [ -z "$ANALYZER_PR" ]; then
@@ -27,6 +31,32 @@ jobs:
         else
           echo "API_TESTS_REF=refs/pull/$API_TESTS_PR/merge" >> $GITHUB_OUTPUT
         fi
+
+        # Set operator tag and image tag based on base branch - fetch latest release dynamically
+        case "${GITHUB_BASE_REF}" in
+          release-0.9)
+            OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.9\.[0-9]+\s" | head -1 | awk '{print $1}')
+            if [ -z "$OPERATOR_TAG" ]; then
+              echo "Warning: No v0.9.x stable release found, falling back to v0.9.2"
+              OPERATOR_TAG="v0.9.2"
+            fi
+            echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT
+            echo "TAG=release-0.9" >> $GITHUB_OUTPUT
+            ;;
+          release-0.8)
+            OPERATOR_TAG=$(gh release list -R konveyor/operator --limit 100 | grep -E "^v0\.8\.[0-9]+\s" | head -1 | awk '{print $1}')
+            if [ -z "$OPERATOR_TAG" ]; then
+              echo "Warning: No v0.8.x stable release found, falling back to v0.8.3"
+              OPERATOR_TAG="v0.8.3"
+            fi
+            echo "OPERATOR_TAG=${OPERATOR_TAG}" >> $GITHUB_OUTPUT
+            echo "TAG=release-0.8" >> $GITHUB_OUTPUT
+            ;;
+          *)
+            echo "OPERATOR_TAG=latest" >> $GITHUB_OUTPUT
+            echo "TAG=latest" >> $GITHUB_OUTPUT
+            ;;
+        esac
     
     - name: checkout
       uses: actions/checkout@v3
@@ -67,4 +97,6 @@ jobs:
     uses: konveyor/ci/.github/workflows/global-ci.yml@main
     with:
       component_name: java-provider
+      tag: "${{ needs.build-addon.outputs.tag }}"
       api_tests_ref: "${{ needs.build-addon.outputs.api_tests_ref }}"
+      operator_tag: "${{ needs.build-addon.outputs.operator_tag }}"
diff --git a/Dockerfile b/Dockerfile
index b7ebfa5..e080839 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download
 WORKDIR /jdtls
-RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\
+RUN curl -fsSL -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.60.0/jdt-language-server-1.60.0-202606262232.tar.gz &&\
 	tar -xvf jdtls.tar.gz --no-same-owner &&\
 	chmod 755 /jdtls/bin/jdtls &&\
         rm -rf jdtls.tar.gz
diff --git a/Dockerfile.test b/Dockerfile.test
index e23d17a..169a357 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download
 WORKDIR /jdtls
-RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\
+RUN curl -fsSL -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.60.0/jdt-language-server-1.60.0-202606262232.tar.gz &&\
 	tar -xvf jdtls.tar.gz --no-same-owner --no-same-permissions &&\
 	chmod 755 /jdtls/bin/jdtls &&\
         rm -rf jdtls.tar.gz
diff --git a/java-analyzer-bundle.tp/java-analyzer-bundle.target b/java-analyzer-bundle.tp/java-analyzer-bundle.target
index b20db48..a8b7fd3 100644
--- a/java-analyzer-bundle.tp/java-analyzer-bundle.target
+++ b/java-analyzer-bundle.tp/java-analyzer-bundle.target
@@ -2,12 +2,12 @@
 <?pde version="3.8"?>
 <target name="Java Analyzer Target Platform">
 	<locations>
-		<!-- 1st: pick up JDT.LS bits (1.51.0)
+		<!-- 1st: pick up JDT.LS bits (1.60.0)
 		-->
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner"
 			includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.jdt.ls.core" version="0.0.0" />
-			<repository location="https://download.eclipse.org/jdtls/milestones/1.51.0/repository"/>
+			<repository location="https://download.eclipse.org/jdtls/milestones/1.60.0/repository"/>
 		</location>