diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d82ade5a22..4153e1455a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -32,30 +32,35 @@ permissions:
   contents: write
   pull-requests: write
   issues: write
+  packages: read
 
 jobs:
   build-test:
 
     runs-on: ubuntu-latest
+    container: ghcr.io/codenameone/codenameone/pr-ci-container:latest
+    defaults:
+      run:
+        shell: bash
     strategy:
       fail-fast: false
       matrix:
-        java-version: [8, 17, 21, 25]
+        java-version: [8, 17, 21]
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 8
-        if: matrix.java-version == 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-          java-package: jdk+fx
-      - name: Set up JDK
-        if: matrix.java-version != 8
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: ${{ matrix.java-version }}
+      - name: Set up Java
+        run: |
+          if [ "${{ matrix.java-version }}" = "8" ]; then
+             echo "JAVA_HOME=${JAVA_HOME_8}" >> $GITHUB_ENV
+             echo "${JAVA_HOME_8}/bin" >> $GITHUB_PATH
+          elif [ "${{ matrix.java-version }}" = "17" ]; then
+             echo "JAVA_HOME=${JAVA_HOME_17}" >> $GITHUB_ENV
+             echo "${JAVA_HOME_17}/bin" >> $GITHUB_PATH
+          elif [ "${{ matrix.java-version }}" = "21" ]; then
+             echo "JAVA_HOME=${JAVA_HOME_21}" >> $GITHUB_ENV
+             echo "${JAVA_HOME_21}/bin" >> $GITHUB_PATH
+          fi
       - name: Cache Maven dependencies
         uses: actions/cache@v4
         with:
@@ -76,7 +81,8 @@ jobs:
         run: |
           set -euo pipefail
           rm -rf maven/target/cn1-binaries
-          git clone --depth=1 --filter=blob:none https://github.com/codenameone/cn1-binaries maven/target/cn1-binaries
+          mkdir -p maven/target
+          cp -r /opt/cn1-binaries maven/target/cn1-binaries
       - name: Run Maven plugin tests
         working-directory: maven
         env:
@@ -226,12 +232,8 @@ jobs:
           script: |
             const { publishQualityComment } = require('./.github/scripts/publish-quality-comment.js');
             await publishQualityComment({ github, context, core });
-      - name: Install dependencies
-        run: |
-          sudo apt-get update && sudo apt-get install xvfb
-          wget https://github.com/codenameone/cn1-binaries/archive/refs/heads/master.zip
-          unzip master.zip -d ..
-          mv ../cn1-binaries-master ../cn1-binaries
+      - name: Link cn1-binaries
+        run: ln -s /opt/cn1-binaries ../cn1-binaries
       - name: Build CLDC11 JAR
         run: |
           ANT_OPTS_ARGS=""
diff --git a/Ports/Android/src/com/codename1/impl/android/AndroidScreenshotTask.java b/Ports/Android/src/com/codename1/impl/android/AndroidScreenshotTask.java
index f2dfdb6d50..3282678dc4 100644
--- a/Ports/Android/src/com/codename1/impl/android/AndroidScreenshotTask.java
+++ b/Ports/Android/src/com/codename1/impl/android/AndroidScreenshotTask.java
@@ -73,7 +73,7 @@ public void onPixelCopyFinished(int copyResult) {
                     new Handler(Looper.getMainLooper())
             );
         } catch (Throwable t) {
-            // Any unexpected issue → fallback
+            // Any unexpected issue -> fallback
             Log.e(t);
             tryFallbackDraw(w, h);
         }