diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7aa4a8b..88e285e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1354,15 +1354,15 @@ jobs:
             make ${{ matrix.arch_name.image }}.test
           fi
 
-      # Updated on 19/05/2022
+      # Updated on 15/07/2025
       - name: stockfish build test
         if: ${{ matrix.arch_name.stockfish == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
         run: |
-          git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
-          cd Stockfish/src
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
-          cd ../..
+          git clone --depth 1 --branch sf_17.1 https://github.com/official-stockfish/Stockfish.git
+          cd Stockfish
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src net
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          cd ..
           rm -rf Stockfish
 
       # Updated on 12/09/2022
@@ -1398,15 +1398,15 @@ jobs:
           rm -rf C
 
       # Updated on 12/09/2022 No longer maintained
-      - name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
-        run: |
-          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-          cd C-Plus-Plus
-          git checkout 0594923efa8e6b006a5d754c5e7976850290577c
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-          cd ..
-          rm -rf C-Plus-Plus
+      #- name: C-Plus-Plus build test
+      #  if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+      #  run: |
+      #    git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
+      #    cd C-Plus-Plus
+      #    git checkout 0594923efa8e6b006a5d754c5e7976850290577c
+      #    ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
+      #    cd ..
+      #    rm -rf C-Plus-Plus
 
       # Updated on 03/08/2024
       - name: llama.cpp build test
diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in
index 2d1d4c1..74d6f6b 100644
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@@ -17,7 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \
diff --git a/android-arm64/Dockerfile.in b/android-arm64/Dockerfile.in
index 953d6e2..85d36bd 100644
--- a/android-arm64/Dockerfile.in
+++ b/android-arm64/Dockerfile.in
@@ -21,7 +21,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \
diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile
index 7b0720c..8173985 100644
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \
diff --git a/android-x86_64/Dockerfile b/android-x86_64/Dockerfile
index aa20b8a..18fdbc5 100644
--- a/android-x86_64/Dockerfile
+++ b/android-x86_64/Dockerfile
@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=25b
+ENV ANDROID_NDK_REVISION=28b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \