diff --git a/5.020.003-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.020.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
index 0d3df7c..e93f8ae 100644
--- a/5.020.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging,longdouble,threaded-buster/Dockerfile b/5.020.003-main,debugging,longdouble,threaded-buster/Dockerfile
index c5179a7..173b52e 100644
--- a/5.020.003-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.020.003-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.020.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 813ce94..521e2f4 100644
--- a/5.020.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging,quadmath,threaded-buster/Dockerfile b/5.020.003-main,debugging,quadmath,threaded-buster/Dockerfile
index 3ccfd07..2abe8a6 100644
--- a/5.020.003-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.020.003-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging,threaded-bullseye/Dockerfile b/5.020.003-main,debugging,threaded-bullseye/Dockerfile
index 364a92d..fb32ba5 100644
--- a/5.020.003-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging,threaded-buster/Dockerfile b/5.020.003-main,debugging,threaded-buster/Dockerfile
index 673b046..cb0bad3 100644
--- a/5.020.003-main,debugging,threaded-buster/Dockerfile
+++ b/5.020.003-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging-bullseye/Dockerfile b/5.020.003-main,debugging-bullseye/Dockerfile
index b89ce3e..f0b667b 100644
--- a/5.020.003-main,debugging-bullseye/Dockerfile
+++ b/5.020.003-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,debugging-buster/Dockerfile b/5.020.003-main,debugging-buster/Dockerfile
index 40cd66d..dc80ba7 100644
--- a/5.020.003-main,debugging-buster/Dockerfile
+++ b/5.020.003-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,longdouble,threaded-bullseye/Dockerfile b/5.020.003-main,longdouble,threaded-bullseye/Dockerfile
index 09a9755..8e83471 100644
--- a/5.020.003-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,longdouble,threaded-buster/Dockerfile b/5.020.003-main,longdouble,threaded-buster/Dockerfile
index 6e1fd88..3312d1a 100644
--- a/5.020.003-main,longdouble,threaded-buster/Dockerfile
+++ b/5.020.003-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,longdouble-bullseye/Dockerfile b/5.020.003-main,longdouble-bullseye/Dockerfile
index a14a2f7..36007b9 100644
--- a/5.020.003-main,longdouble-bullseye/Dockerfile
+++ b/5.020.003-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,longdouble-buster/Dockerfile b/5.020.003-main,longdouble-buster/Dockerfile
index 962d355..19c4a0a 100644
--- a/5.020.003-main,longdouble-buster/Dockerfile
+++ b/5.020.003-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,quadmath,threaded-bullseye/Dockerfile b/5.020.003-main,quadmath,threaded-bullseye/Dockerfile
index ec6dac2..42e3356 100644
--- a/5.020.003-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,quadmath,threaded-buster/Dockerfile b/5.020.003-main,quadmath,threaded-buster/Dockerfile
index 98fb244..64b746c 100644
--- a/5.020.003-main,quadmath,threaded-buster/Dockerfile
+++ b/5.020.003-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,quadmath-bullseye/Dockerfile b/5.020.003-main,quadmath-bullseye/Dockerfile
index f77db12..0c56ac3 100644
--- a/5.020.003-main,quadmath-bullseye/Dockerfile
+++ b/5.020.003-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,quadmath-buster/Dockerfile b/5.020.003-main,quadmath-buster/Dockerfile
index 674462a..a27c00d 100644
--- a/5.020.003-main,quadmath-buster/Dockerfile
+++ b/5.020.003-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,threaded-bullseye/Dockerfile b/5.020.003-main,threaded-bullseye/Dockerfile
index c0048ec..991df5e 100644
--- a/5.020.003-main,threaded-bullseye/Dockerfile
+++ b/5.020.003-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main,threaded-buster/Dockerfile b/5.020.003-main,threaded-buster/Dockerfile
index 5c3aead..0e62e51 100644
--- a/5.020.003-main,threaded-buster/Dockerfile
+++ b/5.020.003-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main-bullseye/Dockerfile b/5.020.003-main-bullseye/Dockerfile
index 1d08a2a..4a4e129 100644
--- a/5.020.003-main-bullseye/Dockerfile
+++ b/5.020.003-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.020.003-main-buster/Dockerfile b/5.020.003-main-buster/Dockerfile
index 736fab6..e6dfb38 100644
--- a/5.020.003-main-buster/Dockerfile
+++ b/5.020.003-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.20.3.tar.bz2 -o perl-5.20.3.tar.bz2 \
-    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
+    && echo '1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b *perl-5.20.3.tar.bz2' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.20.3.tar.bz2 -C /usr/src/perl \
     && rm perl-5.20.3.tar.bz2 \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.022.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
index 2dd437e..f3dcb32 100644
--- a/5.022.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,longdouble,threaded-buster/Dockerfile b/5.022.004-main,debugging,longdouble,threaded-buster/Dockerfile
index b87e279..f9e1269 100644
--- a/5.022.004-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.022.004-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.022.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
index f02cb3e..72d991b 100644
--- a/5.022.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,quadmath,threaded-buster/Dockerfile b/5.022.004-main,debugging,quadmath,threaded-buster/Dockerfile
index 76e56fb..35ad79c 100644
--- a/5.022.004-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.022.004-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,threaded-bullseye/Dockerfile b/5.022.004-main,debugging,threaded-bullseye/Dockerfile
index 6125119..78cf6c4 100644
--- a/5.022.004-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging,threaded-buster/Dockerfile b/5.022.004-main,debugging,threaded-buster/Dockerfile
index 21506d5..0a6dbbf 100644
--- a/5.022.004-main,debugging,threaded-buster/Dockerfile
+++ b/5.022.004-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging-bullseye/Dockerfile b/5.022.004-main,debugging-bullseye/Dockerfile
index abadb29..bb85f36 100644
--- a/5.022.004-main,debugging-bullseye/Dockerfile
+++ b/5.022.004-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,debugging-buster/Dockerfile b/5.022.004-main,debugging-buster/Dockerfile
index ac8e166..d3d0e99 100644
--- a/5.022.004-main,debugging-buster/Dockerfile
+++ b/5.022.004-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,longdouble,threaded-bullseye/Dockerfile b/5.022.004-main,longdouble,threaded-bullseye/Dockerfile
index d530854..b1f236a 100644
--- a/5.022.004-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,longdouble,threaded-buster/Dockerfile b/5.022.004-main,longdouble,threaded-buster/Dockerfile
index bd3f0dc..df868db 100644
--- a/5.022.004-main,longdouble,threaded-buster/Dockerfile
+++ b/5.022.004-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,longdouble-bullseye/Dockerfile b/5.022.004-main,longdouble-bullseye/Dockerfile
index 1507bc7..8f47491 100644
--- a/5.022.004-main,longdouble-bullseye/Dockerfile
+++ b/5.022.004-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,longdouble-buster/Dockerfile b/5.022.004-main,longdouble-buster/Dockerfile
index bbe42fb..78600bd 100644
--- a/5.022.004-main,longdouble-buster/Dockerfile
+++ b/5.022.004-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,quadmath,threaded-bullseye/Dockerfile b/5.022.004-main,quadmath,threaded-bullseye/Dockerfile
index ff203b4..bc71fba 100644
--- a/5.022.004-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,quadmath,threaded-buster/Dockerfile b/5.022.004-main,quadmath,threaded-buster/Dockerfile
index 2f19610..c7a6670 100644
--- a/5.022.004-main,quadmath,threaded-buster/Dockerfile
+++ b/5.022.004-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,quadmath-bullseye/Dockerfile b/5.022.004-main,quadmath-bullseye/Dockerfile
index e777d10..57027a2 100644
--- a/5.022.004-main,quadmath-bullseye/Dockerfile
+++ b/5.022.004-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,quadmath-buster/Dockerfile b/5.022.004-main,quadmath-buster/Dockerfile
index 5a0a81a..46aae16 100644
--- a/5.022.004-main,quadmath-buster/Dockerfile
+++ b/5.022.004-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,threaded-bullseye/Dockerfile b/5.022.004-main,threaded-bullseye/Dockerfile
index bedfdd0..0e4c38f 100644
--- a/5.022.004-main,threaded-bullseye/Dockerfile
+++ b/5.022.004-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main,threaded-buster/Dockerfile b/5.022.004-main,threaded-buster/Dockerfile
index 25201b0..1bcfd40 100644
--- a/5.022.004-main,threaded-buster/Dockerfile
+++ b/5.022.004-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main-bullseye/Dockerfile b/5.022.004-main-bullseye/Dockerfile
index bea0d30..4e79c43 100644
--- a/5.022.004-main-bullseye/Dockerfile
+++ b/5.022.004-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.022.004-main-buster/Dockerfile b/5.022.004-main-buster/Dockerfile
index 753a66f..a4799e2 100644
--- a/5.022.004-main-buster/Dockerfile
+++ b/5.022.004-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.22.4.tar.xz -o perl-5.22.4.tar.xz \
-    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
+    && echo '713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8 *perl-5.22.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.22.4.tar.xz -C /usr/src/perl \
     && rm perl-5.22.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.024.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
index 24941bd..488d8a9 100644
--- a/5.024.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,longdouble,threaded-buster/Dockerfile b/5.024.004-main,debugging,longdouble,threaded-buster/Dockerfile
index 9b6f5ff..e797cbc 100644
--- a/5.024.004-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.024.004-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.024.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
index ece7cbb..7c0c5b3 100644
--- a/5.024.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,quadmath,threaded-buster/Dockerfile b/5.024.004-main,debugging,quadmath,threaded-buster/Dockerfile
index 5c7cb8d..ee40aae 100644
--- a/5.024.004-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.024.004-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,threaded-bullseye/Dockerfile b/5.024.004-main,debugging,threaded-bullseye/Dockerfile
index 50b0749..88b9170 100644
--- a/5.024.004-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging,threaded-buster/Dockerfile b/5.024.004-main,debugging,threaded-buster/Dockerfile
index 4fea530..7c5914f 100644
--- a/5.024.004-main,debugging,threaded-buster/Dockerfile
+++ b/5.024.004-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging-bullseye/Dockerfile b/5.024.004-main,debugging-bullseye/Dockerfile
index 6d9c937..c311d36 100644
--- a/5.024.004-main,debugging-bullseye/Dockerfile
+++ b/5.024.004-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,debugging-buster/Dockerfile b/5.024.004-main,debugging-buster/Dockerfile
index cb7dbcf..fd768f5 100644
--- a/5.024.004-main,debugging-buster/Dockerfile
+++ b/5.024.004-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,longdouble,threaded-bullseye/Dockerfile b/5.024.004-main,longdouble,threaded-bullseye/Dockerfile
index b838c59..94f0c15 100644
--- a/5.024.004-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,longdouble,threaded-buster/Dockerfile b/5.024.004-main,longdouble,threaded-buster/Dockerfile
index ea85fe6..632aeff 100644
--- a/5.024.004-main,longdouble,threaded-buster/Dockerfile
+++ b/5.024.004-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,longdouble-bullseye/Dockerfile b/5.024.004-main,longdouble-bullseye/Dockerfile
index e975f78..2adc0eb 100644
--- a/5.024.004-main,longdouble-bullseye/Dockerfile
+++ b/5.024.004-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,longdouble-buster/Dockerfile b/5.024.004-main,longdouble-buster/Dockerfile
index f7334c0..0104d87 100644
--- a/5.024.004-main,longdouble-buster/Dockerfile
+++ b/5.024.004-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,quadmath,threaded-bullseye/Dockerfile b/5.024.004-main,quadmath,threaded-bullseye/Dockerfile
index 3120cff..8db9277 100644
--- a/5.024.004-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,quadmath,threaded-buster/Dockerfile b/5.024.004-main,quadmath,threaded-buster/Dockerfile
index b912116..ba4a9c7 100644
--- a/5.024.004-main,quadmath,threaded-buster/Dockerfile
+++ b/5.024.004-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,quadmath-bullseye/Dockerfile b/5.024.004-main,quadmath-bullseye/Dockerfile
index f80ed06..ae53882 100644
--- a/5.024.004-main,quadmath-bullseye/Dockerfile
+++ b/5.024.004-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,quadmath-buster/Dockerfile b/5.024.004-main,quadmath-buster/Dockerfile
index ad65931..9614fce 100644
--- a/5.024.004-main,quadmath-buster/Dockerfile
+++ b/5.024.004-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,threaded-bullseye/Dockerfile b/5.024.004-main,threaded-bullseye/Dockerfile
index c8d2341..7bd395b 100644
--- a/5.024.004-main,threaded-bullseye/Dockerfile
+++ b/5.024.004-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main,threaded-buster/Dockerfile b/5.024.004-main,threaded-buster/Dockerfile
index 7d626da..0fbffa8 100644
--- a/5.024.004-main,threaded-buster/Dockerfile
+++ b/5.024.004-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main-bullseye/Dockerfile b/5.024.004-main-bullseye/Dockerfile
index b384228..dcb19d9 100644
--- a/5.024.004-main-bullseye/Dockerfile
+++ b/5.024.004-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.024.004-main-buster/Dockerfile b/5.024.004-main-buster/Dockerfile
index fd69edb..9a5fc5e 100644
--- a/5.024.004-main-buster/Dockerfile
+++ b/5.024.004-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.24.4.tar.xz -o perl-5.24.4.tar.xz \
-    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
+    && echo '7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 *perl-5.24.4.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.24.4.tar.xz -C /usr/src/perl \
     && rm perl-5.24.4.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.026.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
index f9c3141..9268f51 100644
--- a/5.026.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,longdouble,threaded-buster/Dockerfile b/5.026.003-main,debugging,longdouble,threaded-buster/Dockerfile
index c839ac3..3d8cbce 100644
--- a/5.026.003-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.026.003-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.026.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 2940ba2..c5937fc 100644
--- a/5.026.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,quadmath,threaded-buster/Dockerfile b/5.026.003-main,debugging,quadmath,threaded-buster/Dockerfile
index 2360746..f62e3a6 100644
--- a/5.026.003-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.026.003-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,threaded-bullseye/Dockerfile b/5.026.003-main,debugging,threaded-bullseye/Dockerfile
index aeb9446..cd0f557 100644
--- a/5.026.003-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging,threaded-buster/Dockerfile b/5.026.003-main,debugging,threaded-buster/Dockerfile
index e1a6cd3..37d5cc0 100644
--- a/5.026.003-main,debugging,threaded-buster/Dockerfile
+++ b/5.026.003-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging-bullseye/Dockerfile b/5.026.003-main,debugging-bullseye/Dockerfile
index 027763f..8a31d7c 100644
--- a/5.026.003-main,debugging-bullseye/Dockerfile
+++ b/5.026.003-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,debugging-buster/Dockerfile b/5.026.003-main,debugging-buster/Dockerfile
index 7768f1a..2eb5893 100644
--- a/5.026.003-main,debugging-buster/Dockerfile
+++ b/5.026.003-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,longdouble,threaded-bullseye/Dockerfile b/5.026.003-main,longdouble,threaded-bullseye/Dockerfile
index cd19247..14acfbb 100644
--- a/5.026.003-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,longdouble,threaded-buster/Dockerfile b/5.026.003-main,longdouble,threaded-buster/Dockerfile
index 4e3de92..c67df2b 100644
--- a/5.026.003-main,longdouble,threaded-buster/Dockerfile
+++ b/5.026.003-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,longdouble-bullseye/Dockerfile b/5.026.003-main,longdouble-bullseye/Dockerfile
index 1e5c1aa..5600ddb 100644
--- a/5.026.003-main,longdouble-bullseye/Dockerfile
+++ b/5.026.003-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,longdouble-buster/Dockerfile b/5.026.003-main,longdouble-buster/Dockerfile
index c7f1162..8410308 100644
--- a/5.026.003-main,longdouble-buster/Dockerfile
+++ b/5.026.003-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,quadmath,threaded-bullseye/Dockerfile b/5.026.003-main,quadmath,threaded-bullseye/Dockerfile
index 65c6a2f..40b5a86 100644
--- a/5.026.003-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,quadmath,threaded-buster/Dockerfile b/5.026.003-main,quadmath,threaded-buster/Dockerfile
index 1a0ce6c..d13c4c9 100644
--- a/5.026.003-main,quadmath,threaded-buster/Dockerfile
+++ b/5.026.003-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,quadmath-bullseye/Dockerfile b/5.026.003-main,quadmath-bullseye/Dockerfile
index f5f6dbc..6785f3b 100644
--- a/5.026.003-main,quadmath-bullseye/Dockerfile
+++ b/5.026.003-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,quadmath-buster/Dockerfile b/5.026.003-main,quadmath-buster/Dockerfile
index 035cd95..0e7e92a 100644
--- a/5.026.003-main,quadmath-buster/Dockerfile
+++ b/5.026.003-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,threaded-bullseye/Dockerfile b/5.026.003-main,threaded-bullseye/Dockerfile
index 3bbc7a4..48ac9cc 100644
--- a/5.026.003-main,threaded-bullseye/Dockerfile
+++ b/5.026.003-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main,threaded-buster/Dockerfile b/5.026.003-main,threaded-buster/Dockerfile
index 947f346..aa07b93 100644
--- a/5.026.003-main,threaded-buster/Dockerfile
+++ b/5.026.003-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main-bullseye/Dockerfile b/5.026.003-main-bullseye/Dockerfile
index 678a5e0..c52d87e 100644
--- a/5.026.003-main-bullseye/Dockerfile
+++ b/5.026.003-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.026.003-main-buster/Dockerfile b/5.026.003-main-buster/Dockerfile
index f4523ad..88ded4e 100644
--- a/5.026.003-main-buster/Dockerfile
+++ b/5.026.003-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.26.3.tar.xz -o perl-5.26.3.tar.xz \
-    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
+    && echo 'e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 *perl-5.26.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.26.3.tar.xz -C /usr/src/perl \
     && rm perl-5.26.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.028.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
index c1e0409..05ae80a 100644
--- a/5.028.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,longdouble,threaded-buster/Dockerfile b/5.028.003-main,debugging,longdouble,threaded-buster/Dockerfile
index 70371a3..484d45a 100644
--- a/5.028.003-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.028.003-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.028.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 9b7f05b..d045905 100644
--- a/5.028.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,quadmath,threaded-buster/Dockerfile b/5.028.003-main,debugging,quadmath,threaded-buster/Dockerfile
index e67fc61..d549515 100644
--- a/5.028.003-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.028.003-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,threaded-bullseye/Dockerfile b/5.028.003-main,debugging,threaded-bullseye/Dockerfile
index 4ddf8e2..15cb8da 100644
--- a/5.028.003-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging,threaded-buster/Dockerfile b/5.028.003-main,debugging,threaded-buster/Dockerfile
index fa56eae..9e671b4 100644
--- a/5.028.003-main,debugging,threaded-buster/Dockerfile
+++ b/5.028.003-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging-bullseye/Dockerfile b/5.028.003-main,debugging-bullseye/Dockerfile
index 73693cd..682ad91 100644
--- a/5.028.003-main,debugging-bullseye/Dockerfile
+++ b/5.028.003-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,debugging-buster/Dockerfile b/5.028.003-main,debugging-buster/Dockerfile
index 7c268c9..81b979b 100644
--- a/5.028.003-main,debugging-buster/Dockerfile
+++ b/5.028.003-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,longdouble,threaded-bullseye/Dockerfile b/5.028.003-main,longdouble,threaded-bullseye/Dockerfile
index 6d7da17..e11dbbb 100644
--- a/5.028.003-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,longdouble,threaded-buster/Dockerfile b/5.028.003-main,longdouble,threaded-buster/Dockerfile
index 14ced21..a14f205 100644
--- a/5.028.003-main,longdouble,threaded-buster/Dockerfile
+++ b/5.028.003-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,longdouble-bullseye/Dockerfile b/5.028.003-main,longdouble-bullseye/Dockerfile
index e7834a5..3f84a5a 100644
--- a/5.028.003-main,longdouble-bullseye/Dockerfile
+++ b/5.028.003-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,longdouble-buster/Dockerfile b/5.028.003-main,longdouble-buster/Dockerfile
index ebded10..eaf5f11 100644
--- a/5.028.003-main,longdouble-buster/Dockerfile
+++ b/5.028.003-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,quadmath,threaded-bullseye/Dockerfile b/5.028.003-main,quadmath,threaded-bullseye/Dockerfile
index 377612d..3663eab 100644
--- a/5.028.003-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,quadmath,threaded-buster/Dockerfile b/5.028.003-main,quadmath,threaded-buster/Dockerfile
index 227cffe..52d3331 100644
--- a/5.028.003-main,quadmath,threaded-buster/Dockerfile
+++ b/5.028.003-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,quadmath-bullseye/Dockerfile b/5.028.003-main,quadmath-bullseye/Dockerfile
index b9e688f..b4cdee9 100644
--- a/5.028.003-main,quadmath-bullseye/Dockerfile
+++ b/5.028.003-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,quadmath-buster/Dockerfile b/5.028.003-main,quadmath-buster/Dockerfile
index 25c1a79..5384cfa 100644
--- a/5.028.003-main,quadmath-buster/Dockerfile
+++ b/5.028.003-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,threaded-bullseye/Dockerfile b/5.028.003-main,threaded-bullseye/Dockerfile
index bb7ce41..1323514 100644
--- a/5.028.003-main,threaded-bullseye/Dockerfile
+++ b/5.028.003-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main,threaded-buster/Dockerfile b/5.028.003-main,threaded-buster/Dockerfile
index ba2a567..1c28f95 100644
--- a/5.028.003-main,threaded-buster/Dockerfile
+++ b/5.028.003-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main-bullseye/Dockerfile b/5.028.003-main-bullseye/Dockerfile
index 65a742c..87e1f6c 100644
--- a/5.028.003-main-bullseye/Dockerfile
+++ b/5.028.003-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.028.003-main-buster/Dockerfile b/5.028.003-main-buster/Dockerfile
index f1decf0..dad1a07 100644
--- a/5.028.003-main-buster/Dockerfile
+++ b/5.028.003-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.28.3.tar.xz -o perl-5.28.3.tar.xz \
-    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
+    && echo '77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5 *perl-5.28.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.28.3.tar.xz -C /usr/src/perl \
     && rm perl-5.28.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.030.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
index afbb733..a547d4e 100644
--- a/5.030.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,longdouble,threaded-buster/Dockerfile b/5.030.003-main,debugging,longdouble,threaded-buster/Dockerfile
index fbc9909..fda6ea1 100644
--- a/5.030.003-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.030.003-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.030.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 652c6dd..26b64cc 100644
--- a/5.030.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,quadmath,threaded-buster/Dockerfile b/5.030.003-main,debugging,quadmath,threaded-buster/Dockerfile
index df6c770..1103cfe 100644
--- a/5.030.003-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.030.003-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,threaded-bullseye/Dockerfile b/5.030.003-main,debugging,threaded-bullseye/Dockerfile
index 0493c50..7b15184 100644
--- a/5.030.003-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging,threaded-buster/Dockerfile b/5.030.003-main,debugging,threaded-buster/Dockerfile
index ef0226c..e7dc871 100644
--- a/5.030.003-main,debugging,threaded-buster/Dockerfile
+++ b/5.030.003-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging-bullseye/Dockerfile b/5.030.003-main,debugging-bullseye/Dockerfile
index 5a43a07..12e5110 100644
--- a/5.030.003-main,debugging-bullseye/Dockerfile
+++ b/5.030.003-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,debugging-buster/Dockerfile b/5.030.003-main,debugging-buster/Dockerfile
index 3d2f891..6fe087b 100644
--- a/5.030.003-main,debugging-buster/Dockerfile
+++ b/5.030.003-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,longdouble,threaded-bullseye/Dockerfile b/5.030.003-main,longdouble,threaded-bullseye/Dockerfile
index de8a4a8..00b90b8 100644
--- a/5.030.003-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,longdouble,threaded-buster/Dockerfile b/5.030.003-main,longdouble,threaded-buster/Dockerfile
index 0e6d4ec..2ebfd77 100644
--- a/5.030.003-main,longdouble,threaded-buster/Dockerfile
+++ b/5.030.003-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,longdouble-bullseye/Dockerfile b/5.030.003-main,longdouble-bullseye/Dockerfile
index 732810f..138e369 100644
--- a/5.030.003-main,longdouble-bullseye/Dockerfile
+++ b/5.030.003-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,longdouble-buster/Dockerfile b/5.030.003-main,longdouble-buster/Dockerfile
index 824d084..c3b7191 100644
--- a/5.030.003-main,longdouble-buster/Dockerfile
+++ b/5.030.003-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,quadmath,threaded-bullseye/Dockerfile b/5.030.003-main,quadmath,threaded-bullseye/Dockerfile
index 9d1d9db..6ea4bc5 100644
--- a/5.030.003-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,quadmath,threaded-buster/Dockerfile b/5.030.003-main,quadmath,threaded-buster/Dockerfile
index d62e0d1..76c1dd4 100644
--- a/5.030.003-main,quadmath,threaded-buster/Dockerfile
+++ b/5.030.003-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,quadmath-bullseye/Dockerfile b/5.030.003-main,quadmath-bullseye/Dockerfile
index e48495c..18f1d5c 100644
--- a/5.030.003-main,quadmath-bullseye/Dockerfile
+++ b/5.030.003-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,quadmath-buster/Dockerfile b/5.030.003-main,quadmath-buster/Dockerfile
index 7e36a0d..88b6169 100644
--- a/5.030.003-main,quadmath-buster/Dockerfile
+++ b/5.030.003-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,threaded-bullseye/Dockerfile b/5.030.003-main,threaded-bullseye/Dockerfile
index a388fd3..0645770 100644
--- a/5.030.003-main,threaded-bullseye/Dockerfile
+++ b/5.030.003-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main,threaded-buster/Dockerfile b/5.030.003-main,threaded-buster/Dockerfile
index c8e3902..e25034b 100644
--- a/5.030.003-main,threaded-buster/Dockerfile
+++ b/5.030.003-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main-bullseye/Dockerfile b/5.030.003-main-bullseye/Dockerfile
index 3da3194..d776230 100644
--- a/5.030.003-main-bullseye/Dockerfile
+++ b/5.030.003-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.030.003-main-buster/Dockerfile b/5.030.003-main-buster/Dockerfile
index 667be42..507c9f7 100644
--- a/5.030.003-main-buster/Dockerfile
+++ b/5.030.003-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.30.3.tar.xz -o perl-5.30.3.tar.xz \
-    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
+    && echo '6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4 *perl-5.30.3.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.30.3.tar.xz -C /usr/src/perl \
     && rm perl-5.30.3.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.032.001-main,debugging,longdouble,threaded-bullseye/Dockerfile
index 453fada..c15ab1c 100644
--- a/5.032.001-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,longdouble,threaded-buster/Dockerfile b/5.032.001-main,debugging,longdouble,threaded-buster/Dockerfile
index 4deb60e..215a2d1 100644
--- a/5.032.001-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.032.001-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.032.001-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 457dad8..00c3249 100644
--- a/5.032.001-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,quadmath,threaded-buster/Dockerfile b/5.032.001-main,debugging,quadmath,threaded-buster/Dockerfile
index a899c94..2e139ec 100644
--- a/5.032.001-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.032.001-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,threaded-bullseye/Dockerfile b/5.032.001-main,debugging,threaded-bullseye/Dockerfile
index 1274273..208b404 100644
--- a/5.032.001-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging,threaded-buster/Dockerfile b/5.032.001-main,debugging,threaded-buster/Dockerfile
index 6fc1aa6..4fd1af2 100644
--- a/5.032.001-main,debugging,threaded-buster/Dockerfile
+++ b/5.032.001-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging-bullseye/Dockerfile b/5.032.001-main,debugging-bullseye/Dockerfile
index 060ca56..636cb66 100644
--- a/5.032.001-main,debugging-bullseye/Dockerfile
+++ b/5.032.001-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,debugging-buster/Dockerfile b/5.032.001-main,debugging-buster/Dockerfile
index dbfdcd1..d88b7bb 100644
--- a/5.032.001-main,debugging-buster/Dockerfile
+++ b/5.032.001-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,longdouble,threaded-bullseye/Dockerfile b/5.032.001-main,longdouble,threaded-bullseye/Dockerfile
index 6bba35f..d83baa4 100644
--- a/5.032.001-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,longdouble,threaded-buster/Dockerfile b/5.032.001-main,longdouble,threaded-buster/Dockerfile
index 24a6f43..b87074b 100644
--- a/5.032.001-main,longdouble,threaded-buster/Dockerfile
+++ b/5.032.001-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,longdouble-bullseye/Dockerfile b/5.032.001-main,longdouble-bullseye/Dockerfile
index cb178b6..c36c69c 100644
--- a/5.032.001-main,longdouble-bullseye/Dockerfile
+++ b/5.032.001-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,longdouble-buster/Dockerfile b/5.032.001-main,longdouble-buster/Dockerfile
index bc1ce5f..bf815c4 100644
--- a/5.032.001-main,longdouble-buster/Dockerfile
+++ b/5.032.001-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,quadmath,threaded-bullseye/Dockerfile b/5.032.001-main,quadmath,threaded-bullseye/Dockerfile
index 082f81c..4aca4e5 100644
--- a/5.032.001-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,quadmath,threaded-buster/Dockerfile b/5.032.001-main,quadmath,threaded-buster/Dockerfile
index 73f3d52..3fa985b 100644
--- a/5.032.001-main,quadmath,threaded-buster/Dockerfile
+++ b/5.032.001-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,quadmath-bullseye/Dockerfile b/5.032.001-main,quadmath-bullseye/Dockerfile
index 48fd5b2..72210db 100644
--- a/5.032.001-main,quadmath-bullseye/Dockerfile
+++ b/5.032.001-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,quadmath-buster/Dockerfile b/5.032.001-main,quadmath-buster/Dockerfile
index 64ef813..4ee1c37 100644
--- a/5.032.001-main,quadmath-buster/Dockerfile
+++ b/5.032.001-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,threaded-bullseye/Dockerfile b/5.032.001-main,threaded-bullseye/Dockerfile
index 602d433..7762540 100644
--- a/5.032.001-main,threaded-bullseye/Dockerfile
+++ b/5.032.001-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main,threaded-buster/Dockerfile b/5.032.001-main,threaded-buster/Dockerfile
index be08352..c9cb080 100644
--- a/5.032.001-main,threaded-buster/Dockerfile
+++ b/5.032.001-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main-bullseye/Dockerfile b/5.032.001-main-bullseye/Dockerfile
index df0e232..c961f49 100644
--- a/5.032.001-main-bullseye/Dockerfile
+++ b/5.032.001-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.032.001-main-buster/Dockerfile b/5.032.001-main-buster/Dockerfile
index 854c868..9a2aa39 100644
--- a/5.032.001-main-buster/Dockerfile
+++ b/5.032.001-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.32.1.tar.xz -o perl-5.32.1.tar.xz \
-    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
+    && echo '57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309 *perl-5.32.1.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.32.1.tar.xz -C /usr/src/perl \
     && rm perl-5.32.1.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,longdouble,threaded-bullseye/Dockerfile b/5.034.000-main,debugging,longdouble,threaded-bullseye/Dockerfile
index 0cc1304..f1daca8 100644
--- a/5.034.000-main,debugging,longdouble,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,debugging,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,longdouble,threaded-buster/Dockerfile b/5.034.000-main,debugging,longdouble,threaded-buster/Dockerfile
index e2710a4..df1ae96 100644
--- a/5.034.000-main,debugging,longdouble,threaded-buster/Dockerfile
+++ b/5.034.000-main,debugging,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,quadmath,threaded-bullseye/Dockerfile b/5.034.000-main,debugging,quadmath,threaded-bullseye/Dockerfile
index 72f8266..836b1f7 100644
--- a/5.034.000-main,debugging,quadmath,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,debugging,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,quadmath,threaded-buster/Dockerfile b/5.034.000-main,debugging,quadmath,threaded-buster/Dockerfile
index 887cc05..cae3bb5 100644
--- a/5.034.000-main,debugging,quadmath,threaded-buster/Dockerfile
+++ b/5.034.000-main,debugging,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,threaded-bullseye/Dockerfile b/5.034.000-main,debugging,threaded-bullseye/Dockerfile
index 39b30e2..74c4e85 100644
--- a/5.034.000-main,debugging,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,debugging,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging,threaded-buster/Dockerfile b/5.034.000-main,debugging,threaded-buster/Dockerfile
index 3cc3d4c..75f1e00 100644
--- a/5.034.000-main,debugging,threaded-buster/Dockerfile
+++ b/5.034.000-main,debugging,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging-bullseye/Dockerfile b/5.034.000-main,debugging-bullseye/Dockerfile
index 03f2ca8..f27996a 100644
--- a/5.034.000-main,debugging-bullseye/Dockerfile
+++ b/5.034.000-main,debugging-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,debugging-buster/Dockerfile b/5.034.000-main,debugging-buster/Dockerfile
index 2fb3996..3385c56 100644
--- a/5.034.000-main,debugging-buster/Dockerfile
+++ b/5.034.000-main,debugging-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Accflags=-ggdb -DDEBUGGING -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,longdouble,threaded-bullseye/Dockerfile b/5.034.000-main,longdouble,threaded-bullseye/Dockerfile
index 1792662..f61fff1 100644
--- a/5.034.000-main,longdouble,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,longdouble,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,longdouble,threaded-buster/Dockerfile b/5.034.000-main,longdouble,threaded-buster/Dockerfile
index 1c3dda6..080eed6 100644
--- a/5.034.000-main,longdouble,threaded-buster/Dockerfile
+++ b/5.034.000-main,longdouble,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,longdouble-bullseye/Dockerfile b/5.034.000-main,longdouble-bullseye/Dockerfile
index d579d28..e56ddb3 100644
--- a/5.034.000-main,longdouble-bullseye/Dockerfile
+++ b/5.034.000-main,longdouble-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,longdouble-buster/Dockerfile b/5.034.000-main,longdouble-buster/Dockerfile
index cbdcc5d..f78644c 100644
--- a/5.034.000-main,longdouble-buster/Dockerfile
+++ b/5.034.000-main,longdouble-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duselongdouble -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,quadmath,threaded-bullseye/Dockerfile b/5.034.000-main,quadmath,threaded-bullseye/Dockerfile
index a9d6c81..fc5cea1 100644
--- a/5.034.000-main,quadmath,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,quadmath,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,quadmath,threaded-buster/Dockerfile b/5.034.000-main,quadmath,threaded-buster/Dockerfile
index 54d597a..78521c8 100644
--- a/5.034.000-main,quadmath,threaded-buster/Dockerfile
+++ b/5.034.000-main,quadmath,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,quadmath-bullseye/Dockerfile b/5.034.000-main,quadmath-bullseye/Dockerfile
index 87a3d99..436b136 100644
--- a/5.034.000-main,quadmath-bullseye/Dockerfile
+++ b/5.034.000-main,quadmath-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,quadmath-buster/Dockerfile b/5.034.000-main,quadmath-buster/Dockerfile
index c3232d5..62a45ee 100644
--- a/5.034.000-main,quadmath-buster/Dockerfile
+++ b/5.034.000-main,quadmath-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusequadmath -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,threaded-bullseye/Dockerfile b/5.034.000-main,threaded-bullseye/Dockerfile
index 526f84c..9935a2a 100644
--- a/5.034.000-main,threaded-bullseye/Dockerfile
+++ b/5.034.000-main,threaded-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main,threaded-buster/Dockerfile b/5.034.000-main,threaded-buster/Dockerfile
index 0e07eff..6ca5bea 100644
--- a/5.034.000-main,threaded-buster/Dockerfile
+++ b/5.034.000-main,threaded-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main-bullseye/Dockerfile b/5.034.000-main-bullseye/Dockerfile
index 73e503e..ad6c3c4 100644
--- a/5.034.000-main-bullseye/Dockerfile
+++ b/5.034.000-main-bullseye/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:bullseye-backports
+FROM debian:bullseye-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/5.034.000-main-buster/Dockerfile b/5.034.000-main-buster/Dockerfile
index abf951f..1c7bc02 100644
--- a/5.034.000-main-buster/Dockerfile
+++ b/5.034.000-main-buster/Dockerfile
@@ -1,27 +1,56 @@
-FROM buildpack-deps:buster-backports
+FROM debian:buster-backports
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN true \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    &&     apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       libbz2-dev \
+       libdb-dev \
+       libc6-dev \
+       libgdbm-dev \
+       liblzma-dev \
+       make \
+       netbase \
+       patch \
+       procps \
+       zlib1g-dev \
+       xz-utils \
     && curl -SL https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz -o perl-5.34.0.tar.xz \
-    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
+    && echo '82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded *perl-5.34.0.tar.xz' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-5.34.0.tar.xz -C /usr/src/perl \
     && rm perl-5.34.0.tar.xz \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local -Aldflags='-Wl,-z,now -Wl,-zrelro -Wl,-z,noexecstack' -Accflags='-fpie -fPIC -fstack-protector-all -pie -D_FORTIFY_SOURCE=2' -Duseshrplib  -des \
     && make -j$(nproc) \
-    && LD_LIBRARY_PATH=. ./perl -Ilib -de0 \
-    && make install \
+    && TEST_JOBS=$(nproc) make test_harness
+RUN make install \
     && cd /usr/src \
     && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
     && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
     && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
-    && true \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
     && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
 
 WORKDIR /
diff --git a/config.yml b/config.yml
index dbac93b..c0260ff 100644
--- a/config.yml
+++ b/config.yml
@@ -12,7 +12,7 @@ options:
 releases:
   - version: 5.28.3
     sha256:  77dc1ddf541643af14d585867d3d0741cce45d0dbe8f1467024e63165d9e2fc5
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -20,7 +20,7 @@ releases:
 
   - version: 5.26.3
     sha256: e0a17cdaed5304aea1783e507e56bb0001dd72c46f211553ead3a580c3f38135 
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -28,7 +28,7 @@ releases:
 
   - version: 5.24.4
     sha256: 7f080287ff64750270689843ae945f02159a33cb8f2fc910248c15befba5db84 
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -36,7 +36,7 @@ releases:
 
   - version: 5.22.4
     sha256:  713243dce27d7aa0bdbf52b2070de5ce449f9ffbcc14a93efbc6f2beff0f5ce8
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -44,7 +44,7 @@ releases:
 
   - version: 5.20.3
     sha256:  1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
-    run_tests: no
+    run_tests: parallel
     type:    bz2
     debian_release:
       - buster
@@ -52,7 +52,7 @@ releases:
 
   - version: 5.30.3
     sha256:  6967595f2e3f3a94544c35152f9a25e0cb8ea24ae45f4bf1882f2e33f4a400f4
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -60,7 +60,7 @@ releases:
 
   - version: 5.32.1
     sha256:  57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
@@ -68,7 +68,7 @@ releases:
 
   - version: 5.34.0
     sha256:  82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded
-    run_tests: no
+    run_tests: parallel
     type:    xz
     debian_release:
       - buster
diff --git a/generate.pl b/generate.pl
index f5feade..b623ecf 100755
--- a/generate.pl
+++ b/generate.pl
@@ -36,8 +36,7 @@ EOF
 }
 
 my $docker_slim_run_install = <<'EOF';
-apt-get update \
-    && apt-get install -y --no-install-recommends \
+    apt-get install -y --no-install-recommends \
        bzip2 \
        ca-certificates \
        # cpio \
@@ -152,7 +151,7 @@ for my $release (@{$config->{releases}}) {
 
     $release->{extra_flags}    ||= '';
 
-    $release->{image} = $build =~ /main/ ? 'buildpack-deps' : 'debian';
+    $release->{image} = 'debian';
 
     for my $debian_release (@{$release->{debian_release}}) {
 
@@ -161,16 +160,9 @@ for my $release (@{$config->{releases}}) {
         for (qw(version pause extra_flags sha256 type url image cpanm_dist_name cpanm_dist_url cpanm_dist_sha256));
       $output =~ s/\{\{args\}\}/$builds{$build}/mg;
 
-      if ($build =~ /slim/) {
         $output =~ s/\{\{docker_slim_run_install\}\}/$docker_slim_run_install/mg;
         $output =~ s/\{\{docker_slim_run_purge\}\}/$docker_slim_run_purge/mg;
-        $output =~ s/\{\{tag\}\}/$debian_release-slim/mg;
-      }
-      else {
-        $output =~ s/\{\{docker_slim_run_install\}\}/true/mg;
-        $output =~ s/\{\{docker_slim_run_purge\}\}/true/mg;
-        $output =~ s/\{\{tag\}\}/$debian_release/mg;
-      }
+	$output =~ s/\{\{tag\}\}/$debian_release/mg;
 
       my $dir = sprintf "%i.%03i.%03i-%s-%s", ($release->{version} =~ /(\d+)\.(\d+)\.(\d+)/), $build, $debian_release;
 
@@ -288,19 +280,25 @@ LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
-RUN {{docker_slim_run_install}} \
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list \
+    && apt update \
+    && apt -yq full-upgrade \
+    && apt -yq build-dep perl \
+    && {{docker_slim_run_install}} \
     && curl -SL {{url}} -o perl-{{version}}.tar.{{type}} \
-    && echo '{{sha256}} *perl-{{version}}.tar.{{type}}' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-{{version}}.tar.{{type}} -C /usr/src/perl \
+    && echo '{{sha256}} *perl-{{version}}.tar.{{type}}' | sha256sum -c -
+RUN tar --strip-components=1 -xaf perl-{{version}}.tar.{{type}} -C /usr/src/perl \
     && rm perl-{{version}}.tar.{{type}} \
-    && cat *.patch | patch -p1 \
-    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && cat *.patch | patch -p1
+RUN gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
     && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
     && ./Configure -Darchname="$gnuArch" "$archFlag" {{args}} {{extra_flags}} -des \
     && make -j$(nproc) \
-    && {{test}} \
-    && make install \
+    && {{test}}
+RUN make install \
     && cd /usr/src \
     && curl -LO {{cpanm_dist_url}} \
     && echo '{{cpanm_dist_sha256}} *{{cpanm_dist_name}}.tar.gz' | sha256sum -c - \