diff --git a/images/debian/buster/amd64/Dockerfile b/images/debian/buster/amd64/Dockerfile
index 248893ad470f54db88d879d51ec1cc4da53bdfe3..03ba9451234529485d606df166fe53bdf7381f3c 100644
--- a/images/debian/buster/amd64/Dockerfile
+++ b/images/debian/buster/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-buster
+FROM openjdk:8-buster
 
 LABEL maintainer="etimmons@mit.edu"
 
@@ -24,7 +24,7 @@ RUN set -x \
     && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-src-${ABCL_VERSION}.tar" \
-    && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk11 && ant abcl ) \
+    && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk8 && ant abcl ) \
     && ln -s "/usr/local/src/abcl-src-$ABCL_VERSION/abcl" /usr/local/bin/abcl \
     && rm -rf "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && apt-get remove -y curl ca-certificates gnupg dirmngr ant \
diff --git a/images/debian/buster/arm64/Dockerfile b/images/debian/buster/arm64/Dockerfile
deleted file mode 100644
index 248893ad470f54db88d879d51ec1cc4da53bdfe3..0000000000000000000000000000000000000000
--- a/images/debian/buster/arm64/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM openjdk:11-buster
-
-LABEL maintainer="etimmons@mit.edu"
-
-ENV ABCL_VERSION=1.7.0
-
-WORKDIR /usr/local/src/
-
-ARG ABCL_SIGNING_KEY=5491D207FF9ECDE0BEA277772A9641104DB1773D
-
-# hadolint ignore=DL3003,DL3008
-RUN set -x \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends curl ca-certificates gnupg dirmngr ant \
-    && curl -L https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz > abcl-src-${ABCL_VERSION}.tar.gz \
-    && curl -L https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc > abcl-src-${ABCL_VERSION}.tar.gz.asc \
-    && GNUPGHOME="$(mktemp -d)" \
-    && export GNUPGHOME \
-    && (gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${ABCL_SIGNING_KEY} \
-       || gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${ABCL_SIGNING_KEY} \
-       || gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${ABCL_SIGNING_KEY} \
-       || gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${ABCL_SIGNING_KEY} \
-       || gpg --batch --keyserver pgp.mit.edu --recv-keys ${ABCL_SIGNING_KEY}) \
-    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
-    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
-    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
-    && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk11 && ant abcl ) \
-    && ln -s "/usr/local/src/abcl-src-$ABCL_VERSION/abcl" /usr/local/bin/abcl \
-    && rm -rf "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
-    && apt-get remove -y curl ca-certificates gnupg dirmngr ant \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /
-
-COPY docker-entrypoint /usr/local/bin/docker-entrypoint
-
-ENTRYPOINT ["docker-entrypoint"]
-
-CMD ["abcl"]
diff --git a/images/debian/buster/arm64/docker-entrypoint b/images/debian/buster/arm64/docker-entrypoint
deleted file mode 100755
index 1c800343f0434bb533622ecbcbfabd7fd9ec5a7d..0000000000000000000000000000000000000000
--- a/images/debian/buster/arm64/docker-entrypoint
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# If the first arg starts with a hyphen, prepend abcl to
-# arguments.
-if [ "${1#-}" != "$1" ]; then
-	set -- abcl "$@"
-fi
-
-exec "$@"
diff --git a/manifest-templates/debian-buster.yaml b/manifest-templates/debian-buster.yaml
index 22ab15916491edd14227a1ea9f7248fd5db5b73f..5de0bc2b112983bc8a8946264b5e82bbd2d5939e 100644
--- a/manifest-templates/debian-buster.yaml
+++ b/manifest-templates/debian-buster.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux
diff --git a/manifest-templates/debian.yaml b/manifest-templates/debian.yaml
index 38438a602184857657e4c9583821e8ab37f9bbbc..235b85497d9fe315c03f60aabf7fea115da372d2 100644
--- a/manifest-templates/debian.yaml
+++ b/manifest-templates/debian.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux
diff --git a/manifest-templates/latest.yaml b/manifest-templates/latest.yaml
index 641ad8b5fe70ed94d7f4a15298ed26964f85dc94..e855b3066d0dc1257d761ba12e31a97ef4bb4e13 100644
--- a/manifest-templates/latest.yaml
+++ b/manifest-templates/latest.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux
diff --git a/manifest-templates/versioned-debian-buster.yaml b/manifest-templates/versioned-debian-buster.yaml
index d7a5a42a35d32654aff359fb64e18a1a23272c39..bf1c276c1f3ab71500feba181ddf89582c184ac7 100644
--- a/manifest-templates/versioned-debian-buster.yaml
+++ b/manifest-templates/versioned-debian-buster.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux
diff --git a/manifest-templates/versioned-debian.yaml b/manifest-templates/versioned-debian.yaml
index f2f265a746afc789b0477840bf722bdb062317c4..085c6e0c495c680a7cf52594861aed062fb6363e 100644
--- a/manifest-templates/versioned-debian.yaml
+++ b/manifest-templates/versioned-debian.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux
diff --git a/manifest-templates/versioned.yaml b/manifest-templates/versioned.yaml
index e182f8b7094322432339fc7518a385596ca20ec1..0f2d704dd50fe2ef74646f20007a653530ad7512 100644
--- a/manifest-templates/versioned.yaml
+++ b/manifest-templates/versioned.yaml
@@ -4,7 +4,3 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST
-    platform:
-      architecture: arm64
-      os: linux