diff --git a/.gitignore b/.gitignore
index d548f66d..da4ffd78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .jq-template.awk
+.yq*
diff --git a/10.0/php8.1/apache-bookworm/Dockerfile b/10.0/php8.1/apache-bookworm/Dockerfile
index 3c1ea03d..279d2fbf 100644
--- a/10.0/php8.1/apache-bookworm/Dockerfile
+++ b/10.0/php8.1/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.1/apache-bullseye/Dockerfile b/10.0/php8.1/apache-bullseye/Dockerfile
index 042138b8..ca1ae1a8 100644
--- a/10.0/php8.1/apache-bullseye/Dockerfile
+++ b/10.0/php8.1/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.1/fpm-alpine3.18/Dockerfile b/10.0/php8.1/fpm-alpine3.18/Dockerfile
index e4538133..d448cc57 100644
--- a/10.0/php8.1/fpm-alpine3.18/Dockerfile
+++ b/10.0/php8.1/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.1/fpm-alpine3.19/Dockerfile b/10.0/php8.1/fpm-alpine3.19/Dockerfile
index d57e5a81..021cf80d 100644
--- a/10.0/php8.1/fpm-alpine3.19/Dockerfile
+++ b/10.0/php8.1/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.1/fpm-bookworm/Dockerfile b/10.0/php8.1/fpm-bookworm/Dockerfile
index dde8caf2..3b7f95c1 100644
--- a/10.0/php8.1/fpm-bookworm/Dockerfile
+++ b/10.0/php8.1/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.1/fpm-bullseye/Dockerfile b/10.0/php8.1/fpm-bullseye/Dockerfile
index f7cfc2dd..b7daa618 100644
--- a/10.0/php8.1/fpm-bullseye/Dockerfile
+++ b/10.0/php8.1/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/apache-bookworm/Dockerfile b/10.0/php8.2/apache-bookworm/Dockerfile
index f5fc06fb..7cf0bed9 100644
--- a/10.0/php8.2/apache-bookworm/Dockerfile
+++ b/10.0/php8.2/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/apache-bullseye/Dockerfile b/10.0/php8.2/apache-bullseye/Dockerfile
index b505ffaf..43b823c9 100644
--- a/10.0/php8.2/apache-bullseye/Dockerfile
+++ b/10.0/php8.2/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/fpm-alpine3.18/Dockerfile b/10.0/php8.2/fpm-alpine3.18/Dockerfile
index a2de0601..93d0081b 100644
--- a/10.0/php8.2/fpm-alpine3.18/Dockerfile
+++ b/10.0/php8.2/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/fpm-alpine3.19/Dockerfile b/10.0/php8.2/fpm-alpine3.19/Dockerfile
index 1e56e0c4..a49277ad 100644
--- a/10.0/php8.2/fpm-alpine3.19/Dockerfile
+++ b/10.0/php8.2/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/fpm-bookworm/Dockerfile b/10.0/php8.2/fpm-bookworm/Dockerfile
index 7a8cc3c3..f5ac6075 100644
--- a/10.0/php8.2/fpm-bookworm/Dockerfile
+++ b/10.0/php8.2/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.0/php8.2/fpm-bullseye/Dockerfile b/10.0/php8.2/fpm-bullseye/Dockerfile
index b4e68c1e..02e7a9f7 100644
--- a/10.0/php8.2/fpm-bullseye/Dockerfile
+++ b/10.0/php8.2/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-09-20: https://www.drupal.org/project/drupal/releases/10.0.11
 ENV DRUPAL_VERSION 10.0.11
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile
index d7cbb469..51b2747c 100644
--- a/10.1/php8.1/apache-bookworm/Dockerfile
+++ b/10.1/php8.1/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile
index 9baabe2f..83a00515 100644
--- a/10.1/php8.1/apache-bullseye/Dockerfile
+++ b/10.1/php8.1/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/fpm-alpine3.18/Dockerfile b/10.1/php8.1/fpm-alpine3.18/Dockerfile
index cb9a0f8f..0774426c 100644
--- a/10.1/php8.1/fpm-alpine3.18/Dockerfile
+++ b/10.1/php8.1/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/fpm-alpine3.19/Dockerfile b/10.1/php8.1/fpm-alpine3.19/Dockerfile
index 75a3ba78..7c69167e 100644
--- a/10.1/php8.1/fpm-alpine3.19/Dockerfile
+++ b/10.1/php8.1/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile
index 9cf430bd..d42ccf69 100644
--- a/10.1/php8.1/fpm-bookworm/Dockerfile
+++ b/10.1/php8.1/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile
index 1cbc4b91..2b392b6b 100644
--- a/10.1/php8.1/fpm-bullseye/Dockerfile
+++ b/10.1/php8.1/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile
index 26b08400..a443261d 100644
--- a/10.1/php8.2/apache-bookworm/Dockerfile
+++ b/10.1/php8.2/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile
index 071ed198..aedc3acc 100644
--- a/10.1/php8.2/apache-bullseye/Dockerfile
+++ b/10.1/php8.2/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/fpm-alpine3.18/Dockerfile b/10.1/php8.2/fpm-alpine3.18/Dockerfile
index c7c1cde2..bbc44ce3 100644
--- a/10.1/php8.2/fpm-alpine3.18/Dockerfile
+++ b/10.1/php8.2/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/fpm-alpine3.19/Dockerfile b/10.1/php8.2/fpm-alpine3.19/Dockerfile
index e0ef99e9..839fed32 100644
--- a/10.1/php8.2/fpm-alpine3.19/Dockerfile
+++ b/10.1/php8.2/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,7 +55,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile
index 55fd18b0..ae6466e1 100644
--- a/10.1/php8.2/fpm-bookworm/Dockerfile
+++ b/10.1/php8.2/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile
index d485f3d8..360a353a 100644
--- a/10.1/php8.2/fpm-bullseye/Dockerfile
+++ b/10.1/php8.2/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,7 +66,7 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/10.1.7
 ENV DRUPAL_VERSION 10.1.7
 
 WORKDIR /opt/drupal
diff --git a/10.2-rc/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.2/apache-bookworm/Dockerfile
rename to 10.2/php8.2/apache-bookworm/Dockerfile
index 7a7689ac..16a3729d 100644
--- a/10.2-rc/php8.2/apache-bookworm/Dockerfile
+++ b/10.2/php8.2/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.2/apache-bullseye/Dockerfile
rename to 10.2/php8.2/apache-bullseye/Dockerfile
index 27d9afea..f1a8565b 100644
--- a/10.2-rc/php8.2/apache-bullseye/Dockerfile
+++ b/10.2/php8.2/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.2/fpm-alpine3.18/Dockerfile b/10.2/php8.2/fpm-alpine3.18/Dockerfile
similarity index 91%
rename from 10.2-rc/php8.2/fpm-alpine3.18/Dockerfile
rename to 10.2/php8.2/fpm-alpine3.18/Dockerfile
index 337352cf..11f08965 100644
--- a/10.2-rc/php8.2/fpm-alpine3.18/Dockerfile
+++ b/10.2/php8.2/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,8 +55,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile
similarity index 91%
rename from 10.2-rc/php8.2/fpm-alpine3.19/Dockerfile
rename to 10.2/php8.2/fpm-alpine3.19/Dockerfile
index 31678603..280ac545 100644
--- a/10.2-rc/php8.2/fpm-alpine3.19/Dockerfile
+++ b/10.2/php8.2/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,8 +55,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.2/fpm-bookworm/Dockerfile
rename to 10.2/php8.2/fpm-bookworm/Dockerfile
index 1b68f783..fd61cec7 100644
--- a/10.2-rc/php8.2/fpm-bookworm/Dockerfile
+++ b/10.2/php8.2/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.2/fpm-bullseye/Dockerfile
rename to 10.2/php8.2/fpm-bullseye/Dockerfile
index 7f8306cd..57ff6a2d 100644
--- a/10.2-rc/php8.2/fpm-bullseye/Dockerfile
+++ b/10.2/php8.2/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.3/apache-bookworm/Dockerfile
rename to 10.2/php8.3/apache-bookworm/Dockerfile
index 7ea0d7b8..9465cc20 100644
--- a/10.2-rc/php8.3/apache-bookworm/Dockerfile
+++ b/10.2/php8.3/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-apache-bookworm
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.3/apache-bullseye/Dockerfile
rename to 10.2/php8.3/apache-bullseye/Dockerfile
index e8f95f2e..1fa61ab6 100644
--- a/10.2-rc/php8.3/apache-bullseye/Dockerfile
+++ b/10.2/php8.3/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-apache-bullseye
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/fpm-alpine3.18/Dockerfile b/10.2/php8.3/fpm-alpine3.18/Dockerfile
similarity index 91%
rename from 10.2-rc/php8.3/fpm-alpine3.18/Dockerfile
rename to 10.2/php8.3/fpm-alpine3.18/Dockerfile
index 8ad86522..3a0f1927 100644
--- a/10.2-rc/php8.3/fpm-alpine3.18/Dockerfile
+++ b/10.2/php8.3/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -55,8 +55,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile
similarity index 91%
rename from 10.2-rc/php8.3/fpm-alpine3.19/Dockerfile
rename to 10.2/php8.3/fpm-alpine3.19/Dockerfile
index e8d68c85..aa0dae5c 100644
--- a/10.2-rc/php8.3/fpm-alpine3.19/Dockerfile
+++ b/10.2/php8.3/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -55,8 +55,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.3/fpm-bookworm/Dockerfile
rename to 10.2/php8.3/fpm-bookworm/Dockerfile
index 370c6810..3f4ba34b 100644
--- a/10.2-rc/php8.3/fpm-bookworm/Dockerfile
+++ b/10.2/php8.3/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-fpm-bookworm
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/10.2-rc/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile
similarity index 93%
rename from 10.2-rc/php8.3/fpm-bullseye/Dockerfile
rename to 10.2/php8.3/fpm-bullseye/Dockerfile
index 02ea6843..425df00a 100644
--- a/10.2-rc/php8.3/fpm-bullseye/Dockerfile
+++ b/10.2/php8.3/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.3-fpm-bullseye
 
 # install the PHP extensions we need
@@ -66,8 +66,8 @@ RUN { \
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
 
-# https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 10.2.0-rc1
+# 2023-12-15: https://www.drupal.org/project/drupal/releases/10.2.0
+ENV DRUPAL_VERSION 10.2.0
 
 WORKDIR /opt/drupal
 RUN set -eux; \
diff --git a/7/php8.1/apache-bookworm/Dockerfile b/7/php8.1/apache-bookworm/Dockerfile
index a48ad02b..49eb3abb 100644
--- a/7/php8.1/apache-bookworm/Dockerfile
+++ b/7/php8.1/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bookworm
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.1/apache-bullseye/Dockerfile b/7/php8.1/apache-bullseye/Dockerfile
index 775acfe4..f9cf7596 100644
--- a/7/php8.1/apache-bullseye/Dockerfile
+++ b/7/php8.1/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-apache-bullseye
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.1/fpm-alpine3.18/Dockerfile b/7/php8.1/fpm-alpine3.18/Dockerfile
index 51796656..afce9c26 100644
--- a/7/php8.1/fpm-alpine3.18/Dockerfile
+++ b/7/php8.1/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -53,12 +53,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.1/fpm-alpine3.19/Dockerfile b/7/php8.1/fpm-alpine3.19/Dockerfile
index 038cc566..61e24cb3 100644
--- a/7/php8.1/fpm-alpine3.19/Dockerfile
+++ b/7/php8.1/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -53,12 +53,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.1/fpm-bookworm/Dockerfile b/7/php8.1/fpm-bookworm/Dockerfile
index 29523d34..0a95dc3d 100644
--- a/7/php8.1/fpm-bookworm/Dockerfile
+++ b/7/php8.1/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bookworm
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.1/fpm-bullseye/Dockerfile b/7/php8.1/fpm-bullseye/Dockerfile
index 0c68438f..0715d898 100644
--- a/7/php8.1/fpm-bullseye/Dockerfile
+++ b/7/php8.1/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.1-fpm-bullseye
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/apache-bookworm/Dockerfile b/7/php8.2/apache-bookworm/Dockerfile
index 48b756b3..c2f476d8 100644
--- a/7/php8.2/apache-bookworm/Dockerfile
+++ b/7/php8.2/apache-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bookworm
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/apache-bullseye/Dockerfile b/7/php8.2/apache-bullseye/Dockerfile
index 8dee7c88..b4006f1f 100644
--- a/7/php8.2/apache-bullseye/Dockerfile
+++ b/7/php8.2/apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-apache-bullseye
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/fpm-alpine3.18/Dockerfile b/7/php8.2/fpm-alpine3.18/Dockerfile
index bb6cc4d6..a0ece759 100644
--- a/7/php8.2/fpm-alpine3.18/Dockerfile
+++ b/7/php8.2/fpm-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.18
 
 # install the PHP extensions we need
@@ -53,12 +53,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/fpm-alpine3.19/Dockerfile b/7/php8.2/fpm-alpine3.19/Dockerfile
index 9f499114..6a55c8bd 100644
--- a/7/php8.2/fpm-alpine3.19/Dockerfile
+++ b/7/php8.2/fpm-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-alpine3.19
 
 # install the PHP extensions we need
@@ -53,12 +53,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/fpm-bookworm/Dockerfile b/7/php8.2/fpm-bookworm/Dockerfile
index f3a62d8e..406f5ecb 100644
--- a/7/php8.2/fpm-bookworm/Dockerfile
+++ b/7/php8.2/fpm-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bookworm
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/7/php8.2/fpm-bullseye/Dockerfile b/7/php8.2/fpm-bullseye/Dockerfile
index 2339438f..309c16d2 100644
--- a/7/php8.2/fpm-bullseye/Dockerfile
+++ b/7/php8.2/fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:8.2-fpm-bullseye
 
 # install the PHP extensions we need
@@ -64,12 +64,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-# https://www.drupal.org/node/3060/release
+# 2023-12-06: https://www.drupal.org/project/drupal/releases/7.99
 ENV DRUPAL_VERSION 7.99
+ENV DRUPAL_URL https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz
 ENV DRUPAL_MD5 0fbcb06e354309356e6b4e33d2cd242d
 
 RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
 	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
 	tar -xz --strip-components=1 -f drupal.tar.gz; \
 	rm drupal.tar.gz; \
diff --git a/Dockerfile.template b/Dockerfile.template
index 5b347837..e88b631e 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -2,7 +2,7 @@
 	def is_alpine:
 		env.variant | index("alpine")
 -}}
-# from https://www.drupal.org/docs/system-requirements/php-requirements
+# https://www.drupal.org/docs/system-requirements/php-requirements
 FROM php:{{ env.phpVersion }}-{{ env.variant }}
 
 # install the PHP extensions we need
@@ -85,22 +85,13 @@ RUN { \
 		echo 'opcache.revalidate_freq=60'; \
 	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-{{ if env.version | startswith("7") then "" else ( -}}
+{{ if has("composer") then ( -}}
 COPY --from=composer:{{ .composer.version }} /usr/bin/composer /usr/local/bin/
 
-{{ ) end -}}
-# https://www.drupal.org/node/3060/release
+{{ ) else "" end -}}
+# {{ .date | strftime("%Y-%m-%d") }}: {{ .notes }}
 ENV DRUPAL_VERSION {{ .version }}
-{{ if env.version | startswith("7") then ( -}}
-ENV DRUPAL_MD5 {{ .md5 }}
-
-RUN set -eux; \
-	curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
-	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
-	tar -xz --strip-components=1 -f drupal.tar.gz; \
-	rm drupal.tar.gz; \
-	chown -R www-data:www-data sites modules themes
-{{ ) else ( -}}
+{{ if has("composer") then ( -}}
 
 WORKDIR /opt/drupal
 RUN set -eux; \
@@ -113,6 +104,16 @@ RUN set -eux; \
 	rm -rf "$COMPOSER_HOME"
 
 ENV PATH=${PATH}:/opt/drupal/vendor/bin
+{{ ) else ( -}}
+ENV DRUPAL_URL {{ .url }}
+ENV DRUPAL_MD5 {{ .md5 }}
+
+RUN set -eux; \
+	curl -fSL "$DRUPAL_URL" -o drupal.tar.gz; \
+	echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+	tar -xz --strip-components=1 -f drupal.tar.gz; \
+	rm drupal.tar.gz; \
+	chown -R www-data:www-data sites modules themes
 {{ ) end -}}
 
 # vim:set ft=dockerfile:
diff --git a/apply-templates.sh b/apply-templates.sh
index 6003835b..9e0b2e9c 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -32,6 +32,11 @@ for version; do
 
 	rm -rf "$version/"
 
+	if jq -e '.[env.version] | not' versions.json > /dev/null; then
+		echo "deleting $version ..."
+		continue
+	fi
+
 	phpVersions="$(jq -r '.[env.version].phpVersions | map(@sh) | join(" ")' versions.json)"
 	eval "phpVersions=( $phpVersions )"
 	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 9f140c60..30ad3c9d 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,8 +2,8 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[10.1]='10 latest'
-	[10.2-rc]='rc'
+	[10.2]='10 latest'
+	[10.3-rc]='rc'
 )
 
 defaultDebianSuite='bookworm'
@@ -108,12 +108,15 @@ join() {
 for version; do
 	export version
 
+	if ! fullVersion="$(jq -er '.[env.version] | if . then .version else empty end' versions.json)"; then
+		continue
+	fi
+
 	phpVersions="$(jq -r '.[env.version].phpVersions | map(@sh) | join(" ")' versions.json)"
 	eval "phpVersions=( $phpVersions )"
 	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
 	eval "variants=( $variants )"
 
-	fullVersion="$(jq -r '.[env.version].version' versions.json)"
 	latestAlpineVersion="$(jq -r '.[env.version].variants[] | ltrimstr("fpm-") | select(startswith("alpine")) | ltrimstr("alpine")' versions.json | sort -rV | head -1)"
 	debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
 	versionDefaultPhpVersion="${defaultPhpVersions[$version]:-$defaultPhpVersion}"
diff --git a/versions.json b/versions.json
index 8dc045ec..f589ca6f 100644
--- a/versions.json
+++ b/versions.json
@@ -1,11 +1,13 @@
 {
-  "10.0": {
-    "composer": {
-      "version": "2"
-    },
+  "10.2": {
+    "version": "10.2.0",
+    "url": "https://ftp.drupal.org/files/projects/drupal-10.2.0.tar.gz",
+    "md5": "d1403d654d7cfa6533fa9df457e730b1",
+    "date": 1702681674,
+    "notes": "https://www.drupal.org/project/drupal/releases/10.2.0",
     "phpVersions": [
-      "8.2",
-      "8.1"
+      "8.3",
+      "8.2"
     ],
     "variants": [
       "apache-bookworm",
@@ -15,12 +17,16 @@
       "fpm-alpine3.19",
       "fpm-alpine3.18"
     ],
-    "version": "10.0.11"
-  },
-  "10.1": {
     "composer": {
       "version": "2"
-    },
+    }
+  },
+  "10.1": {
+    "version": "10.1.7",
+    "url": "https://ftp.drupal.org/files/projects/drupal-10.1.7.tar.gz",
+    "md5": "c89d2e56737da5542a811913bd28de43",
+    "date": 1701857745,
+    "notes": "https://www.drupal.org/project/drupal/releases/10.1.7",
     "phpVersions": [
       "8.2",
       "8.1"
@@ -33,15 +39,19 @@
       "fpm-alpine3.19",
       "fpm-alpine3.18"
     ],
-    "version": "10.1.7"
-  },
-  "10.2-rc": {
     "composer": {
       "version": "2"
-    },
+    }
+  },
+  "10.0": {
+    "version": "10.0.11",
+    "url": "https://ftp.drupal.org/files/projects/drupal-10.0.11.tar.gz",
+    "md5": "3e8d274d025f819e86d0800b18a44f8c",
+    "date": 1695228927,
+    "notes": "https://www.drupal.org/project/drupal/releases/10.0.11",
     "phpVersions": [
-      "8.3",
-      "8.2"
+      "8.2",
+      "8.1"
     ],
     "variants": [
       "apache-bookworm",
@@ -51,10 +61,16 @@
       "fpm-alpine3.19",
       "fpm-alpine3.18"
     ],
-    "version": "10.2.0-rc1"
+    "composer": {
+      "version": "2"
+    }
   },
   "7": {
+    "version": "7.99",
+    "url": "https://ftp.drupal.org/files/projects/drupal-7.99.tar.gz",
     "md5": "0fbcb06e354309356e6b4e33d2cd242d",
+    "date": 1701873806,
+    "notes": "https://www.drupal.org/project/drupal/releases/7.99",
     "phpVersions": [
       "8.2",
       "8.1"
@@ -66,7 +82,6 @@
       "fpm-bullseye",
       "fpm-alpine3.19",
       "fpm-alpine3.18"
-    ],
-    "version": "7.99"
+    ]
   }
 }
diff --git a/versions.sh b/versions.sh
index 7ee71c37..d56c9c69 100755
--- a/versions.sh
+++ b/versions.sh
@@ -3,9 +3,88 @@ set -euo pipefail
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
+yq='./.yq'
+# https://github.com/mikefarah/yq/releases
+# TODO detect host architecture
+yqUrl='https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64'
+yqSha256='0d6aaf1cf44a8d18fbc7ed0ef14f735a8df8d2e314c4cc0f0242d35c0a440c95'
+if command -v xq-python &> /dev/null; then
+	# if we have the Python-based "yq" installed, it also comes with "xq-python" (at least, from Debian), which does meet our needs here
+	yq='xq-python'
+else
+	if command -v yq &> /dev/null && yq --help |& grep -F -- ' --input-format' | grep -qF xml; then
+		# if we have a "yq" on the host, make sure it's the Go-based "yq" (not the Python-based one, handled above)
+		yq='yq'
+	elif [ ! -x "$yq" ] || ! sha256sum <<<"$yqSha256 *$yq" --quiet --strict --check; then
+		wget -qO "$yq.new" "$yqUrl"
+		sha256sum <<<"$yqSha256 *$yq.new" --quiet --strict --check
+		chmod +x "$yq.new"
+		"$yq.new" --version
+		mv "$yq.new" "$yq"
+	fi
+	yq+=' --input-format xml'
+fi
+
+releases="$(
+	wget -qO- 'https://updates.drupal.org/release-history/drupal/current' 'https://updates.drupal.org/release-history/drupal/7.x' \
+		| $yq -r '@json' \
+		| jq -c '
+			# https://stackoverflow.com/a/75770668/433558
+			def semver:
+				sub("[+].*$"; "")
+				| capture("^(?<v>[^-]+)(?:-(?<p>.*))?$") | [.v, .p // empty]
+				| map(split(".") | map(tonumber? // .))
+				| .[1] |= (. // {})
+			;
+			[ .project | if type == "array" then .[] else . end ] # normalize to an array, even if we only fetch one URL (not both "current" and "7.x" -- otherwise this can just be ".project" and we can drop the ".[]"s below)
+			| (
+				[
+					.[]
+					| .supported_branches? // empty,
+						.supported_majors? // empty
+					| split(",")
+				]
+				| flatten
+				| map(rtrimstr("."))
+			) as $versions
+			| reduce (
+				.[].releases.release[]
+				# skip "dev" releases entirely (download artifacts are too unstable / change too often)
+				| select(
+					.status == "published"
+					and (
+						.version
+						| endswith("-dev")
+						| not
+					)
+				)
+				# add a key for the appropriate "X.Y" or "X.Y-rc" value
+				| .folder = (.version | ([ split("[.-]"; "") | if .[0] == "7" then .[0] else .[0,1] end ] | join(".")) + if index("-") then "-rc" else "" end)
+				# filter to *just* versions that the upstream file claims are actually supported ("supported_branches")
+				| select((.folder | rtrimstr("-rc")) as $ver | $versions | index($ver) | not|not)
+			) as $rel ({}; .[$rel.version] = $rel)
+			| to_entries
+			# put all releases in sorted order
+			| sort_by(.value.version | semver)
+			| reverse
+			# ... so we can remove all but the most recent (pre)?release for each branch / folder
+			| unique_by(
+				.value.folder
+				| rtrimstr("-rc")
+				| split("[.-]"; "")
+				| map(tonumber? // .)
+			)
+			| reverse
+			| map(.key = .value.folder)
+			| from_entries
+		'
+)"
+
 versions=( "$@" )
 if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
+	# if no versions are specified, assume the "canonical" list of supported versions
+	versions="$(jq <<<"$releases" -r '[ .[].folder | @sh ] | join(" ")')"
+	eval "versions=( $versions )"
 	json='{}'
 else
 	json="$(< versions.json)"
@@ -13,51 +92,63 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-	export version
+	export version rcVersion="${version%-rc}"
 
-	doc='{}'
-
-	rcGrepV='-v'
-	rcVersion="${version%-rc}"
-	if [ "$rcVersion" != "$version" ]; then
-		rcGrepV=
+	doc="$(jq <<<"$releases" -c '.[env.version] // empty')"
+	if [ -z "$doc" ]; then
+		echo >&2 "warning: skipping/removing '$version' (does not exist or is not supported upstream)"
+		json="$(jq <<<"$json" -c '.[env.version] = null')"
+		continue
 	fi
 
-	case "$rcVersion" in
-		7)
-			# e.g. 7.x
-			drupalRelease="${rcVersion%%.*}.x"
-			;;
-		*)
-			# there is no https://updates.drupal.org/release-history/drupal/10.x
-			# (12/2023) current can be used for 10.x: "<supported_branches>10.0.,10.1.,10.2.</supported_branches>"
-			drupalRelease='current'
-			;;
-	esac
+	doc="$(jq <<<"$doc" -c '
+		first(.files.file[] | select(.archive_type == "tar.gz")) as $file
+		| {
+			version: .version,
+			url: $file.url,
+			md5: $file.md5,
+			date: (.date | tonumber),
+			notes: .release_link,
 
-	fullVersion="$(
-		wget -qO- "https://updates.drupal.org/release-history/drupal/$drupalRelease" \
-			| awk -v RS='[<>]' '
-					$1 == "release" { release = 1; version = ""; mdhash = ""; tag = ""; next }
-					release && $1 ~ /^version|mdhash$/ { tag = $1; next }
-					release && tag == "version" { version = $1 }
-					release && tag == "mdhash" { mdhash = $1 }
-					release { tag = "" }
-					release && $1 == "/release" { release = 0; print version, mdhash }
-				' \
-			| grep -E "^${rcVersion}[. -]" \
-			| grep $rcGrepV -E -- '-rc|-beta|-alpha|-dev' \
-			| head -1
-	)"
-	if [ -z "$fullVersion" ]; then
-		echo >&2 "error: cannot find release for $version"
-		exit 1
-	fi
-	md5="${fullVersion##* }"
-	fullVersion="${fullVersion% $md5}"
-	if [ -n "$md5" ]; then
-		export md5
-		doc="$(jq <<<"$doc" -c '.md5 = env.md5')"
+			# TODO adjust this in a way that is easier to manage over time (semi-automatic variant combinations, for example, based on availability/supported status of upstream PHP images)
+			phpVersions: (
+				# https://www.drupal.org/docs/system-requirements/php-requirements
+				[
+					# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
+					# Drupal now supports PHP 8.3 and recommends at least PHP 8.2.
+					if [ "7", "10.0", "10.1" ] | index(env.version) then empty else "8.3" end,
+					"8.2",
+					if [ "7", "10.0", "10.1" ] | index(env.version) then "8.1" else empty end,
+					# https://www.drupal.org/docs/system-requirements/php-requirements
+					# https://www.drupal.org/docs/7/system-requirements/php-requirements
+					empty
+				]
+			),
+			variants: [
+				"bookworm",
+				"bullseye",
+				"alpine3.19",
+				"alpine3.18",
+				empty
+				| if startswith("alpine") then empty else
+						"apache-" + .
+					end,
+					"fpm-" + .
+			],
+		}
+	')"
+	fullVersion="$(jq <<<"$doc" -r '.version')"
+	[ -n "$fullVersion" ] # sanity check
+
+	if [ "$rcVersion" != "$version" ] && gaFullVersion="$(jq <<<"$json" -er '.[env.rcVersion] | if . then .version else empty end')"; then
+		# Drupal pre-releases appear to be only for .0, so if our pre-release now has a relevant GA, it should go away 👀
+		# just in case, we'll also do a version comparison to make sure we don't have a pre-release that's newer than the relevant GA
+		latestVersion="$({ echo "$fullVersion"; echo "$gaFullVersion"; } | sort -V | tail -1)"
+		if [[ "$fullVersion" == "$gaFullVersion"* ]] || [ "$latestVersion" = "$gaFullVersion" ]; then
+			# "x.y.z-rc1" == x.y.z*
+			json="$(jq <<<"$json" -c 'del(.[env.version])')"
+			continue
+		fi
 	fi
 
 	composerVersion="$(
@@ -70,7 +161,7 @@ for version in "${versions[@]}"; do
 			' \
 			|| :
 	)"
-	if [ "$version" != '7' ] && [ -z "$composerVersion" ]; then
+	if [ "$rcVersion" != '7' ] && [ -z "$composerVersion" ]; then
 		echo >&2 "error: cannot find composer version for '$version' ('$fullVersion')"
 		exit 1
 	fi
@@ -81,37 +172,21 @@ for version in "${versions[@]}"; do
 
 	echo "$version: $fullVersion${composerVersion:+ (composer $composerVersion)}"
 
-	export fullVersion
 	json="$(
 		jq <<<"$json" -c --argjson doc "$doc" '
-			.[env.version] = (
-				{
-					version: env.fullVersion,
-					phpVersions: (
-						[
-							# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
-							# Drupal now supports PHP 8.3 and recommends at least PHP 8.2.
-							if [ "7", "10.0", "10.1" ] | index(env.version) then empty else "8.3" end,
-							"8.2",
-							if [ "7", "10.0", "10.1" ] | index(env.version) then "8.1" else empty end,
-							# https://www.drupal.org/docs/system-requirements/php-requirements
-							# https://www.drupal.org/docs/7/system-requirements/php-requirements
-							empty
-						]
-					),
-				} + $doc
-				| .variants = [
-					"bookworm",
-					"bullseye",
-					"alpine3.19",
-					"alpine3.18",
-					empty
-					| if startswith("alpine") then empty else "apache-" + . end,
-						"fpm-" + .
-				]
-			)
+			.[env.version] = $doc
 		'
 	)"
+
+	# make sure pre-release versions have a placeholder for GA
+	if [ "$version" != "$rcVersion" ]; then
+		json="$(jq <<<"$json" -c '.[env.rcVersion] //= null')"
+	fi
 done
 
-jq <<<"$json" -S . > versions.json
+jq <<<"$json" '
+	to_entries
+	| sort_by(.key | split("[.-]"; "") | map(tonumber? // .))
+	| reverse
+	| from_entries
+' > versions.json