diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index b3b089a..5c5c7fc 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -29,13 +29,16 @@ jobs:
       with:
         maven-version: '3.9.9'
 
-    - name: Print JDK version
-      run: |
-        echo "Installing JDK version: $JAVA_VERSION"
-      env:
-        JAVA_VERSION: ${{ secrets.JAVA_VERSION }}
+    - name: Set up JDK 21
+      if: github.ref == 'refs/heads/feature/T2900-java21'
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'corretto'
+        cache: maven
 
-    - name: Set up JDK
+    - name: Set up JDK from ENV
+      if: github.ref != 'refs/heads/feature/T2900-java21'
       uses: actions/setup-java@v4
       with:
         java-version: '${{ secrets.JAVA_VERSION }}'