diff --git a/5.034.003-main,threaded-bullseye/Dockerfile b/5.034.003-main,threaded-bullseye/Dockerfile
index eced0879..569c1e9c 100644
--- a/5.034.003-main,threaded-bullseye/Dockerfile
+++ b/5.034.003-main,threaded-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-main,threaded-buster/Dockerfile b/5.034.003-main,threaded-buster/Dockerfile
index 8b6d2965..552a0de7 100644
--- a/5.034.003-main,threaded-buster/Dockerfile
+++ b/5.034.003-main,threaded-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-main-bullseye/Dockerfile b/5.034.003-main-bullseye/Dockerfile
index 92732a58..fe5d660c 100644
--- a/5.034.003-main-bullseye/Dockerfile
+++ b/5.034.003-main-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-main-buster/Dockerfile b/5.034.003-main-buster/Dockerfile
index 5a624bd6..204ed0b0 100644
--- a/5.034.003-main-buster/Dockerfile
+++ b/5.034.003-main-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-slim,threaded-bullseye/Dockerfile b/5.034.003-slim,threaded-bullseye/Dockerfile
index cf0f0be5..3957af6c 100644
--- a/5.034.003-slim,threaded-bullseye/Dockerfile
+++ b/5.034.003-slim,threaded-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-slim,threaded-buster/Dockerfile b/5.034.003-slim,threaded-buster/Dockerfile
index 8193b527..02892b53 100644
--- a/5.034.003-slim,threaded-buster/Dockerfile
+++ b/5.034.003-slim,threaded-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-slim-bullseye/Dockerfile b/5.034.003-slim-bullseye/Dockerfile
index 369ab025..517cd664 100644
--- a/5.034.003-slim-bullseye/Dockerfile
+++ b/5.034.003-slim-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.034.003-slim-buster/Dockerfile b/5.034.003-slim-buster/Dockerfile
index b5d34a0c..f08afef2 100644
--- a/5.034.003-slim-buster/Dockerfile
+++ b/5.034.003-slim-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.34.3.tar.xz -o perl-5.34.3.tar.xz \
-    && echo '0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1 *perl-5.34.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.34.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.34.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.34.3.tar.gz -o perl-5.34.3.tar.gz \
+    && echo '5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede *perl-5.34.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.34.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.34.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main,threaded-bookworm/Dockerfile b/5.036.003-main,threaded-bookworm/Dockerfile
index 6cc754c5..13b745a7 100644
--- a/5.036.003-main,threaded-bookworm/Dockerfile
+++ b/5.036.003-main,threaded-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main,threaded-bullseye/Dockerfile b/5.036.003-main,threaded-bullseye/Dockerfile
index 1a3b1d45..006ff8cf 100644
--- a/5.036.003-main,threaded-bullseye/Dockerfile
+++ b/5.036.003-main,threaded-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main,threaded-buster/Dockerfile b/5.036.003-main,threaded-buster/Dockerfile
index b7d1122d..9369fe1f 100644
--- a/5.036.003-main,threaded-buster/Dockerfile
+++ b/5.036.003-main,threaded-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main-bookworm/Dockerfile b/5.036.003-main-bookworm/Dockerfile
index 9287b467..bf654a08 100644
--- a/5.036.003-main-bookworm/Dockerfile
+++ b/5.036.003-main-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main-bullseye/Dockerfile b/5.036.003-main-bullseye/Dockerfile
index d6657704..49e1505f 100644
--- a/5.036.003-main-bullseye/Dockerfile
+++ b/5.036.003-main-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-main-buster/Dockerfile b/5.036.003-main-buster/Dockerfile
index 97e1a955..3e28ba14 100644
--- a/5.036.003-main-buster/Dockerfile
+++ b/5.036.003-main-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim,threaded-bookworm/Dockerfile b/5.036.003-slim,threaded-bookworm/Dockerfile
index d34c3297..8c3b91d8 100644
--- a/5.036.003-slim,threaded-bookworm/Dockerfile
+++ b/5.036.003-slim,threaded-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim,threaded-bullseye/Dockerfile b/5.036.003-slim,threaded-bullseye/Dockerfile
index 172b954e..c28fbf2e 100644
--- a/5.036.003-slim,threaded-bullseye/Dockerfile
+++ b/5.036.003-slim,threaded-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim,threaded-buster/Dockerfile b/5.036.003-slim,threaded-buster/Dockerfile
index 1c7a09e8..da3c0821 100644
--- a/5.036.003-slim,threaded-buster/Dockerfile
+++ b/5.036.003-slim,threaded-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim-bookworm/Dockerfile b/5.036.003-slim-bookworm/Dockerfile
index 868bbad7..6eb80378 100644
--- a/5.036.003-slim-bookworm/Dockerfile
+++ b/5.036.003-slim-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim-bullseye/Dockerfile b/5.036.003-slim-bullseye/Dockerfile
index b6e2ce79..71145441 100644
--- a/5.036.003-slim-bullseye/Dockerfile
+++ b/5.036.003-slim-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.036.003-slim-buster/Dockerfile b/5.036.003-slim-buster/Dockerfile
index 88115b86..8929032a 100644
--- a/5.036.003-slim-buster/Dockerfile
+++ b/5.036.003-slim-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.36.3.tar.xz -o perl-5.36.3.tar.xz \
-    && echo '45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd *perl-5.36.3.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.36.3.tar.xz -C /usr/src/perl \
-    && rm perl-5.36.3.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.36.3.tar.gz -o perl-5.36.3.tar.gz \
+    && echo 'f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a *perl-5.36.3.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.36.3.tar.gz -C /usr/src/perl \
+    && rm perl-5.36.3.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main,threaded-bookworm/Dockerfile b/5.038.002-main,threaded-bookworm/Dockerfile
index fe5af45c..cd7aab42 100644
--- a/5.038.002-main,threaded-bookworm/Dockerfile
+++ b/5.038.002-main,threaded-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main,threaded-bullseye/Dockerfile b/5.038.002-main,threaded-bullseye/Dockerfile
index b3b3731a..f4fbdc4f 100644
--- a/5.038.002-main,threaded-bullseye/Dockerfile
+++ b/5.038.002-main,threaded-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main,threaded-buster/Dockerfile b/5.038.002-main,threaded-buster/Dockerfile
index ca6187c3..5489b404 100644
--- a/5.038.002-main,threaded-buster/Dockerfile
+++ b/5.038.002-main,threaded-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main-bookworm/Dockerfile b/5.038.002-main-bookworm/Dockerfile
index fd23775e..3e03957a 100644
--- a/5.038.002-main-bookworm/Dockerfile
+++ b/5.038.002-main-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main-bullseye/Dockerfile b/5.038.002-main-bullseye/Dockerfile
index 3ba05818..37974441 100644
--- a/5.038.002-main-bullseye/Dockerfile
+++ b/5.038.002-main-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-main-buster/Dockerfile b/5.038.002-main-buster/Dockerfile
index c718273f..0aff3b4f 100644
--- a/5.038.002-main-buster/Dockerfile
+++ b/5.038.002-main-buster/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:buster
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim,threaded-bookworm/Dockerfile b/5.038.002-slim,threaded-bookworm/Dockerfile
index 1c35a717..d754ff17 100644
--- a/5.038.002-slim,threaded-bookworm/Dockerfile
+++ b/5.038.002-slim,threaded-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim,threaded-bullseye/Dockerfile b/5.038.002-slim,threaded-bullseye/Dockerfile
index bbe57be1..30162fc6 100644
--- a/5.038.002-slim,threaded-bullseye/Dockerfile
+++ b/5.038.002-slim,threaded-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim,threaded-buster/Dockerfile b/5.038.002-slim,threaded-buster/Dockerfile
index 61323e69..d1127eed 100644
--- a/5.038.002-slim,threaded-buster/Dockerfile
+++ b/5.038.002-slim,threaded-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim-bookworm/Dockerfile b/5.038.002-slim-bookworm/Dockerfile
index 6dd38d23..8641c4c1 100644
--- a/5.038.002-slim-bookworm/Dockerfile
+++ b/5.038.002-slim-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim-bullseye/Dockerfile b/5.038.002-slim-bullseye/Dockerfile
index 14f8db23..113b0fff 100644
--- a/5.038.002-slim-bullseye/Dockerfile
+++ b/5.038.002-slim-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.038.002-slim-buster/Dockerfile b/5.038.002-slim-buster/Dockerfile
index da8dc650..9ce9df84 100644
--- a/5.038.002-slim-buster/Dockerfile
+++ b/5.038.002-slim-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz -o perl-5.38.2.tar.xz \
-    && echo 'd91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 *perl-5.38.2.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.38.2.tar.xz -C /usr/src/perl \
-    && rm perl-5.38.2.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/P/PE/PEVANS/perl-5.38.2.tar.gz -o perl-5.38.2.tar.gz \
+    && echo 'a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e *perl-5.38.2.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.38.2.tar.gz -C /usr/src/perl \
+    && rm perl-5.38.2.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-main,threaded-bookworm/Dockerfile b/5.039.005-main,threaded-bookworm/Dockerfile
index 3ea5977f..5440c99d 100644
--- a/5.039.005-main,threaded-bookworm/Dockerfile
+++ b/5.039.005-main,threaded-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-main,threaded-bullseye/Dockerfile b/5.039.005-main,threaded-bullseye/Dockerfile
index 595c2224..a02b5f60 100644
--- a/5.039.005-main,threaded-bullseye/Dockerfile
+++ b/5.039.005-main,threaded-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-main-bookworm/Dockerfile b/5.039.005-main-bookworm/Dockerfile
index fcd2e742..94a70c55 100644
--- a/5.039.005-main-bookworm/Dockerfile
+++ b/5.039.005-main-bookworm/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bookworm
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-main-bullseye/Dockerfile b/5.039.005-main-bullseye/Dockerfile
index f0fe36fb..18656337 100644
--- a/5.039.005-main-bullseye/Dockerfile
+++ b/5.039.005-main-bullseye/Dockerfile
@@ -4,10 +4,10 @@ FROM buildpack-deps:bullseye
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-slim,threaded-bookworm/Dockerfile b/5.039.005-slim,threaded-bookworm/Dockerfile
index 963f28d2..379deb81 100644
--- a/5.039.005-slim,threaded-bookworm/Dockerfile
+++ b/5.039.005-slim,threaded-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-slim,threaded-bullseye/Dockerfile b/5.039.005-slim,threaded-bullseye/Dockerfile
index c3a121cf..453b3720 100644
--- a/5.039.005-slim,threaded-bullseye/Dockerfile
+++ b/5.039.005-slim,threaded-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-slim-bookworm/Dockerfile b/5.039.005-slim-bookworm/Dockerfile
index 48457558..41f21774 100644
--- a/5.039.005-slim-bookworm/Dockerfile
+++ b/5.039.005-slim-bookworm/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/5.039.005-slim-bullseye/Dockerfile b/5.039.005-slim-bullseye/Dockerfile
index 0eb807d2..13d468b8 100644
--- a/5.039.005-slim-bullseye/Dockerfile
+++ b/5.039.005-slim-bullseye/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        zlib1g-dev \
        xz-utils \
        libssl-dev \
-    && curl -fL https://www.cpan.org/src/5.0/perl-5.39.5.tar.xz -o perl-5.39.5.tar.xz \
-    && echo '4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930 *perl-5.39.5.tar.xz' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-5.39.5.tar.xz -C /usr/src/perl \
-    && rm perl-5.39.5.tar.xz \
+    && curl -fL https://cpan.metacpan.org/authors/id/E/ET/ETHER/perl-5.39.5.tar.gz -o perl-5.39.5.tar.gz \
+    && echo '39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1 *perl-5.39.5.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-5.39.5.tar.gz -C /usr/src/perl \
+    && rm perl-5.39.5.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
diff --git a/config.yml b/config.yml
index c5971144..09580f0b 100644
--- a/config.yml
+++ b/config.yml
@@ -9,31 +9,27 @@ options:
 
 releases:
   - version: 5.39.5
-    sha256:  4048cf0065f347a03ec85e989631a64e03ba9c9ccbc8f2a35153cad07fe21930
+    sha256:  39e4f8df83cb747edf3e17a0a2f8ee10353ba16729b665cd5047cec2722f6ed1
     extra_flags: "-Dusedevel -Dversiononly=undef"
-    type:    xz
     debian_release:
       - bullseye
       - bookworm
 
   - version: 5.34.3
-    sha256:  0b15c830a9a295c9f9439b6cda389300f0b18092686eaef47fbc9c92f5930ee1
-    type:    xz
+    sha256:  5b12f62863332b2a5f54102af9cdf8c010877e4bf3294911edbd594b2a1e8ede
     debian_release:
       - buster
       - bullseye
 
   - version: 5.36.3
-    sha256:  45a228daef66d02fdccc820e71f87e40d8e3df1fc4431f8d4580ec08033866bd
-    type:    xz
+    sha256:  f2a1ad88116391a176262dd42dfc52ef22afb40f4c0e9810f15d561e6f1c726a
     debian_release:
       - buster
       - bullseye
       - bookworm
 
   - version: 5.38.2
-    sha256:  d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8
-    type:    xz
+    sha256:  a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e
     debian_release:
       - buster
       - bullseye
diff --git a/cpanfile b/cpanfile
index 205ced06..bbf51fd1 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,3 +1,4 @@
+requires 'CPAN::Perl::Releases::MetaCPAN';
 requires 'Devel::PatchPerl';
 requires 'YAML::XS';
 requires 'LWP::Simple';
diff --git a/generate.pl b/generate.pl
index 0f3168cc..efc5fed5 100755
--- a/generate.pl
+++ b/generate.pl
@@ -3,7 +3,9 @@
 use strict;
 use warnings;
 use YAML::XS;
+use CPAN::Perl::Releases::MetaCPAN;
 use Devel::PatchPerl;
+use File::Basename;
 use LWP::Simple;
 
 sub die_with_sample {
@@ -115,9 +117,9 @@ sub die_with_sample {
   die "Bad version: $release->{version}" unless $release->{version} =~ /\A5\.\d+\.\d+\Z/;
 
   my $patch;
-  $release->{type} ||= 'bz2';
-  my $file = "perl-$release->{version}.tar.$release->{type}";
-  my $url  = "https://www.cpan.org/src/5.0/$file";
+  my $tarball = CPAN::Perl::Releases::MetaCPAN::perl_tarballs($release->{version})->{'tar.gz'};
+  my ($file) = File::Basename::fileparse($tarball);
+  my $url  = "https://cpan.metacpan.org/authors/id/$tarball";
   if (-f "downloads/$file" && `sha256sum downloads/$file` =~ /^\Q$release->{sha256}\E\s+\Qdownloads\/$file\E/) {
     print "Skipping download of $file, already current\n";
   }
@@ -130,7 +132,7 @@ sub die_with_sample {
     qx{rm -fR $dir};
     mkdir $dir or die "Couldn't create $dir";
     qx{
-      tar -C "downloads" -xf $dir.tar.$release->{type} &&\
+      tar -C "downloads" -xf $dir.tar.gz &&\
       cd $dir &&\
       find . -exec chmod u+w {} + &&\
       git init &&\
@@ -255,7 +257,6 @@ =head1 DESCRIPTION
 This should be a list of tags for different Debian versions:
 
     - version: 5.30.0
-      type:    xz
       debian_release:
         - bullseye
         - buster
@@ -292,10 +293,10 @@ =head1 DESCRIPTION
 WORKDIR /usr/src/perl
 
 RUN {{docker_slim_run_install}} \
-    && curl -fL {{url}} -o perl-{{version}}.tar.{{type}} \
-    && echo '{{sha256}} *perl-{{version}}.tar.{{type}}' | sha256sum --strict --check - \
-    && tar --strip-components=1 -xaf perl-{{version}}.tar.{{type}} -C /usr/src/perl \
-    && rm perl-{{version}}.tar.{{type}} \
+    && curl -fL {{url}} -o perl-{{version}}.tar.gz \
+    && echo '{{sha256}} *perl-{{version}}.tar.gz' | sha256sum --strict --check - \
+    && tar --strip-components=1 -xaf perl-{{version}}.tar.gz -C /usr/src/perl \
+    && rm perl-{{version}}.tar.gz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \