diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f49f3101..0a413cde 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,28 +59,16 @@ jobs:
         include:
           - platform: linux/amd64
             bin_name: pihole-FTL-amd64
-            builder: alpine
           - platform: linux/386
             bin_name: pihole-FTL-386
-            builder: alpine
-          - platform: linux/arm/v5
-            bin_name: pihole-FTL-armv4
-            builder: debian
-          - platform: linux/arm/v6
-            bin_name: pihole-FTL-armv5
-            builder: debian
           - platform: linux/arm/v6
             bin_name: pihole-FTL-armv6
-            builder: alpine
           - platform: linux/arm/v7
             bin_name: pihole-FTL-armv7
-            builder: alpine
           - platform: linux/arm64/v8
             bin_name: pihole-FTL-arm64
-            builder: alpine
           - platform: linux/riscv64
             bin_name: pihole-FTL-riscv64
-            builder: alpine
 
     env:
       CI_ARCH: ${{ matrix.platform }}
@@ -112,7 +100,6 @@ jobs:
           outputs: |
             type=tar,dest=build.tar
           build-args: |
-            "BUILDER=${{ matrix.builder }}"
             "CI_ARCH=${{ matrix.platform }}"
             "GIT_BRANCH=${{ needs.smoke-tests.outputs.GIT_BRANCH }}"
             "GIT_TAG=${{ needs.smoke-tests.outputs.GIT_TAG }}"
diff --git a/test/arch_test.sh b/test/arch_test.sh
index edc5cce6..01ca0f4e 100644
--- a/test/arch_test.sh
+++ b/test/arch_test.sh
@@ -122,25 +122,14 @@ elif [[ "${CI_ARCH}" == "linux/arm/v6" ]]; then
 
   check_machine "ELF32" "ARM"
 
-  if [ -f "/etc/debian_version" ]; then
-    # Debian Builder
-    check_libs "[libm.so.6] [librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux.so.3]"
-    check_file "ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux.so.3, for GNU/Linux 3.2.0, with debug_info, not stripped"
+  # Alpine Builder
+  check_static # Binary should not rely on any dynamic interpreter
+  check_libs "" # No dependency on any shared library is intended
+  check_file "ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), statically linked, with debug_info, not stripped"
 
-    check_CPU_arch "v5TE"
-    check_FP_arch ""
-
-    check_minimum_glibc_version "2.29"
-  else
-    # Alpine Builder
-    check_static # Binary should not rely on any dynamic interpreter
-    check_libs "" # No dependency on any shared library is intended
-    check_file "ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), statically linked, with debug_info, not stripped"
-
-    check_CPU_arch "v6KZ"
-    # VFPv3 is backwards compatible with VFPv2
-    check_FP_arch "VFPv3"
-  fi
+  check_CPU_arch "v6KZ"
+  # VFPv3 is backwards compatible with VFPv2
+  check_FP_arch "VFPv3"
 
 elif [[ "${CI_ARCH}" == "linux/arm/v7" ]]; then
 
@@ -149,23 +138,8 @@ elif [[ "${CI_ARCH}" == "linux/arm/v7" ]]; then
   check_libs "" # No dependency on any shared library is intended
   check_file "ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), statically linked, with debug_info, not stripped"
 
-  if [ -f "/etc/debian_version" ]; then
-    # Debian Builder
-    check_libs "[libm.so.6] [librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux-armhf.so.3]" # No dependency on any shared library is intended
-    check_file "ELF 32-bit LSB shared object, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-armhf.so.3, for GNU/Linux 3.2.0, not stripped"
-
-    check_CPU_arch "v7"
-    check_FP_arch "VFPv3-D16"
-
-    check_minimum_glibc_version "2.13"
-  else
-    check_static # Binary should not rely on any dynamic interpreter
-    check_libs "" # No dependency on any shared library is intended
-    check_file "ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), statically linked, with debug_info, not stripped"
-
-    check_CPU_arch "v7"
-    check_FP_arch "VFPv3"
-  fi
+  check_CPU_arch "v7"
+  check_FP_arch "VFPv3"
 
 elif [[ "${CI_ARCH}" == "linux/arm64/v8" || "${CI_ARCH}" == "linux/arm64" ]]; then