diff --git a/.github/pkl-workflows/helpers/Steps.pkl b/.github/pkl-workflows/helpers/Steps.pkl
index 66193e8380..43d035b0fb 100644
--- a/.github/pkl-workflows/helpers/Steps.pkl
+++ b/.github/pkl-workflows/helpers/Steps.pkl
@@ -97,11 +97,12 @@ const function setupJDK(): gha.Step = new {
   uses = Actions.setupJDK
   with {
     ["distribution"] = "microsoft"
-    ["java-version"] = 11
+    ["java-version"] = 21
   }
 }
 
 const function setupAndroid(): Listing<gha.Step> = new Listing<gha.Step> {
+  setupJDK()
   new {
     name = "Setup Android"
     uses = Actions.setupAndroid
@@ -110,7 +111,6 @@ const function setupAndroid(): Listing<gha.Step> = new Listing<gha.Step> {
     name = "Install SDK platform 21"
     run = "sdkmanager --install \"platforms;android-21\""
   }
-  setupJDK()
 }
 
 const function configureAWSCredentials(accessKey: String, secretKey: String, region: String): gha.Step = new {
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2e5fc3682f..3fd791b9d8 100755
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -70,15 +70,15 @@ jobs:
       run: |-
         echo "::add-matcher::.github/problem-matchers/csc.json"
         echo "::add-matcher::.github/problem-matchers/msvc.json"
-    - name: Setup Android
-      uses: android-actions/setup-android@e1f5280adf78cf863c0fa43ffabc64a9cd08153f
-    - name: Install SDK platform 21
-      run: sdkmanager --install "platforms;android-21"
     - name: Setup JDK
       uses: actions/setup-java@2e74cbce18569d23ca8b812590dbb83f13ac7c5a
       with:
         distribution: microsoft
-        java-version: 11
+        java-version: 21
+    - name: Setup Android
+      uses: android-actions/setup-android@e1f5280adf78cf863c0fa43ffabc64a9cd08153f
+    - name: Install SDK platform 21
+      run: sdkmanager --install "platforms;android-21"
     - uses: actions/setup-dotnet@5d1464d5da459f3d7085106d52e499f4dc5d0f59
       with:
         dotnet-version: 8.0.x
@@ -911,7 +911,7 @@ jobs:
       uses: actions/setup-java@2e74cbce18569d23ca8b812590dbb83f13ac7c5a
       with:
         distribution: microsoft
-        java-version: 11
+        java-version: 21
     - name: Checkout Code
       uses: actions/checkout@v4
       with:
@@ -972,7 +972,7 @@ jobs:
       uses: actions/setup-java@2e74cbce18569d23ca8b812590dbb83f13ac7c5a
       with:
         distribution: microsoft
-        java-version: 11
+        java-version: 21
     - name: Checkout Code
       uses: actions/checkout@v4
       with: