diff --git a/.github/workflows/java-eks-canary.yml b/.github/workflows/java-eks-canary.yml
index 059a682fa..8d9a4d0f9 100644
--- a/.github/workflows/java-eks-canary.yml
+++ b/.github/workflows/java-eks-canary.yml
@@ -30,3 +30,4 @@ jobs:
       aws-region: ${{ matrix.aws-region }}
       test-cluster-name: 'e2e-canary-test'
       caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '11'
diff --git a/.github/workflows/java-eks-retry.yml b/.github/workflows/java-eks-retry.yml
index ac671a137..c5b35c398 100644
--- a/.github/workflows/java-eks-retry.yml
+++ b/.github/workflows/java-eks-retry.yml
@@ -17,6 +17,9 @@ on:
       caller-workflow-name:
         required: true
         type: string
+      java-version:
+        required: true
+        type: string
 
 concurrency:
   group: 'java-eks-${{ inputs.aws-region }}-${{ github.ref_name }}'
@@ -34,6 +37,7 @@ jobs:
       aws-region: ${{ inputs.aws-region }}
       test-cluster-name: ${{ inputs.test-cluster-name }}
       caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      java-version: ${{ inputs.java-version }}
 
   java-eks-attempt-2:
     needs: [ java-eks-attempt-1 ]
@@ -44,6 +48,7 @@ jobs:
       aws-region: ${{ inputs.aws-region }}
       test-cluster-name: ${{ inputs.test-cluster-name }}
       caller-workflow-name: ${{ inputs.caller-workflow-name }}
+      java-version: ${{ inputs.java-version }}
 
   publish-metric-attempt-1:
     needs: [ java-eks-attempt-1, java-eks-attempt-2 ]
diff --git a/.github/workflows/java-eks-test.yml b/.github/workflows/java-eks-test.yml
index 9dcc0679f..71a2b04ff 100644
--- a/.github/workflows/java-eks-test.yml
+++ b/.github/workflows/java-eks-test.yml
@@ -17,6 +17,11 @@ on:
       caller-workflow-name:
         required: true
         type: string
+      java-version:
+        description: "Currently support version 8, 11, 17, 21, 22"
+        required: false
+        type: string
+        default: '11'
       adot-image-name:
         required: false
         type: string
@@ -37,6 +42,7 @@ env:
   E2E_TEST_AWS_REGION: ${{ inputs.aws-region }}
   CLUSTER_NAME: ${{ inputs.test-cluster-name }}
   CALLER_WORKFLOW_NAME: ${{ inputs.caller-workflow-name }}
+  JAVA_VERSION: ${{ inputs.java-version }}
   ADOT_IMAGE_NAME: ${{ inputs.adot-image-name }}
   CW_AGENT_OPERATOR_TAG: ${{ inputs.cw-agent-operator-tag }}
   E2E_TEST_ACCOUNT_ID: ${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}
@@ -222,8 +228,8 @@ jobs:
 
       - name: Set Sample App Image
         run: |
-          echo MAIN_SAMPLE_APP_IMAGE_ARN="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}" >> $GITHUB_ENV
-          echo REMOTE_SAMPLE_APP_IMAGE_ARN="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}" >> $GITHUB_ENV
+          echo MAIN_SAMPLE_APP_IMAGE_ARN="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_MAIN_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
+          echo REMOTE_SAMPLE_APP_IMAGE_ARN="${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/${{ env.JAVA_REMOTE_SAMPLE_APP_IMAGE }}:v${{ env.JAVA_VERSION }}" >> $GITHUB_ENV
 
       - name: Deploy sample app via terraform and wait for the endpoint to come online
         id: deploy-sample-app