diff --git a/.github/build-native-debian.sh b/.github/build-native-debian.sh
index 55e09ee9..91021d03 100755
--- a/.github/build-native-debian.sh
+++ b/.github/build-native-debian.sh
@@ -11,26 +11,22 @@ if [[ "$DEBIAN_VERSION" == "10" ]]; then
   echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list
 fi
 
-# Add stretch for Java 8
-#cat <<END > /etc/apt/sources.list.d/stretch.list
-#deb http://deb.debian.org/debian stretch main
-#deb http://security.debian.org/debian-security stretch/updates main
-#END
-
 apt-get update -y
 
 apt-get install -y wget apt-transport-https gpg
-wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
-echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
-apt-get update -y
-if [[ "$(uname -m)" == "riscv64" ]]; then
-    # JDK 8 is not available on RISC-V 64
-    apt-get install -y temurin-17-jdk
+if [[ "$(uname -m)" == "riscv64" ]] || [[ "$(uname -m)" == "armv7l" ]]; then
+    # JDK 8 is not available on RISC-V 64 or ARMv5 (reported as armv7l in uname)
+    jdk_package=default-jdk
 else
-    apt-get install -y temurin-8-jdk
+    wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
+    echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+    apt-get update -y
+    jdk_package=temurin-8-jdk
 fi
 
+apt-get install -y $jdk_package
+
 apt-get install -y --no-install-recommends make gcc libc6-dev texinfo
 # Needs to be split, otherwise a newer version of OpenJDK is pulled
 apt-get install -y --no-install-recommends ant
diff --git a/.github/workflows/native-linux.yml b/.github/workflows/native-linux.yml
index 641bd57a..9f242b90 100644
--- a/.github/workflows/native-linux.yml
+++ b/.github/workflows/native-linux.yml
@@ -24,8 +24,8 @@ jobs:
           - arm
           - arm64
           - riscv64
+          - linux-arm-v5
           # these builds do not work and end up just rebuilding x86_64
-          #- linux-arm-v5
           #- s390x
       fail-fast: false
 
@@ -47,7 +47,7 @@ jobs:
         run: sudo apt-get install -y --no-install-recommends qemu-user-static
       - name: Initialize environment variables
         run: |
-          if [[ "${{ matrix.arch }}" == "riscv64" ]]; then 
+          if [[ "${{ matrix.arch }}" == "riscv64" || "${{ matrix.arch }}" == "linux-arm-v5" ]]; then
               echo "DOCKER_IMAGE_NAME=debian:trixie" >> $GITHUB_ENV
           else
               echo "DOCKER_IMAGE_NAME=debian:10" >> $GITHUB_ENV