diff --git a/library/drupal b/library/drupal
index 95ae2d7153c4d..74d51e313b59e 100644
--- a/library/drupal
+++ b/library/drupal
@@ -1,4 +1,4 @@
-# this file is generated via https://github.com/docker-library/drupal/blob/f4b9ef1b8d9a1ce5ca776533e0fbe3ff1ed0c16e/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/drupal/blob/606fe5e43280f393bdbbd0f978f0b41669582a29/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
              Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
@@ -24,15 +24,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 4c74bbfaed173fd090b7819d1f9f52e3b8896860
 Directory: 10.0-rc/php8.1/fpm-buster
 
-Tags: 10.0.0-rc1-php8.1-fpm-alpine3.16, 10.0-rc-php8.1-fpm-alpine3.16, rc-php8.1-fpm-alpine3.16, 10.0.0-rc1-php8.1-fpm-alpine, 10.0-rc-php8.1-fpm-alpine, rc-php8.1-fpm-alpine, 10.0.0-rc1-fpm-alpine3.16, 10.0-rc-fpm-alpine3.16, rc-fpm-alpine3.16, 10.0.0-rc1-fpm-alpine, 10.0-rc-fpm-alpine, rc-fpm-alpine
+Tags: 10.0.0-rc1-php8.1-fpm-alpine3.17, 10.0-rc-php8.1-fpm-alpine3.17, rc-php8.1-fpm-alpine3.17, 10.0.0-rc1-php8.1-fpm-alpine, 10.0-rc-php8.1-fpm-alpine, rc-php8.1-fpm-alpine, 10.0.0-rc1-fpm-alpine3.17, 10.0-rc-fpm-alpine3.17, rc-fpm-alpine3.17, 10.0.0-rc1-fpm-alpine, 10.0-rc-fpm-alpine, rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4c74bbfaed173fd090b7819d1f9f52e3b8896860
-Directory: 10.0-rc/php8.1/fpm-alpine3.16
+GitCommit: 606fe5e43280f393bdbbd0f978f0b41669582a29
+Directory: 10.0-rc/php8.1/fpm-alpine3.17
 
-Tags: 10.0.0-rc1-php8.1-fpm-alpine3.15, 10.0-rc-php8.1-fpm-alpine3.15, rc-php8.1-fpm-alpine3.15, 10.0.0-rc1-fpm-alpine3.15, 10.0-rc-fpm-alpine3.15, rc-fpm-alpine3.15
+Tags: 10.0.0-rc1-php8.1-fpm-alpine3.16, 10.0-rc-php8.1-fpm-alpine3.16, rc-php8.1-fpm-alpine3.16, 10.0.0-rc1-fpm-alpine3.16, 10.0-rc-fpm-alpine3.16, rc-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 4c74bbfaed173fd090b7819d1f9f52e3b8896860
-Directory: 10.0-rc/php8.1/fpm-alpine3.15
+Directory: 10.0-rc/php8.1/fpm-alpine3.16
 
 Tags: 9.4.8-php8.1-apache-bullseye, 9.4-php8.1-apache-bullseye, 9-php8.1-apache-bullseye, php8.1-apache-bullseye, 9.4.8-php8.1-apache, 9.4-php8.1-apache, 9-php8.1-apache, php8.1-apache, 9.4.8-php8.1, 9.4-php8.1, 9-php8.1, php8.1
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -54,15 +54,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
 Directory: 9.4/php8.1/fpm-buster
 
-Tags: 9.4.8-php8.1-fpm-alpine3.16, 9.4-php8.1-fpm-alpine3.16, 9-php8.1-fpm-alpine3.16, php8.1-fpm-alpine3.16, 9.4.8-php8.1-fpm-alpine, 9.4-php8.1-fpm-alpine, 9-php8.1-fpm-alpine, php8.1-fpm-alpine
+Tags: 9.4.8-php8.1-fpm-alpine3.17, 9.4-php8.1-fpm-alpine3.17, 9-php8.1-fpm-alpine3.17, php8.1-fpm-alpine3.17, 9.4.8-php8.1-fpm-alpine, 9.4-php8.1-fpm-alpine, 9-php8.1-fpm-alpine, php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php8.1/fpm-alpine3.16
+GitCommit: 606fe5e43280f393bdbbd0f978f0b41669582a29
+Directory: 9.4/php8.1/fpm-alpine3.17
 
-Tags: 9.4.8-php8.1-fpm-alpine3.15, 9.4-php8.1-fpm-alpine3.15, 9-php8.1-fpm-alpine3.15, php8.1-fpm-alpine3.15
+Tags: 9.4.8-php8.1-fpm-alpine3.16, 9.4-php8.1-fpm-alpine3.16, 9-php8.1-fpm-alpine3.16, php8.1-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php8.1/fpm-alpine3.15
+Directory: 9.4/php8.1/fpm-alpine3.16
 
 Tags: 9.4.8-php8.0-apache-bullseye, 9.4-php8.0-apache-bullseye, 9-php8.0-apache-bullseye, php8.0-apache-bullseye, 9.4.8-php8.0-apache, 9.4-php8.0-apache, 9-php8.0-apache, php8.0-apache, 9.4.8-php8.0, 9.4-php8.0, 9-php8.0, php8.0, 9.4.8-apache-bullseye, 9.4-apache-bullseye, 9-apache-bullseye, apache-bullseye, 9.4.8-apache, 9.4-apache, 9-apache, apache, 9.4.8, 9.4, 9, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -84,46 +84,11 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
 Directory: 9.4/php8.0/fpm-buster
 
-Tags: 9.4.8-php8.0-fpm-alpine3.16, 9.4-php8.0-fpm-alpine3.16, 9-php8.0-fpm-alpine3.16, php8.0-fpm-alpine3.16, 9.4.8-php8.0-fpm-alpine, 9.4-php8.0-fpm-alpine, 9-php8.0-fpm-alpine, php8.0-fpm-alpine, 9.4.8-fpm-alpine3.16, 9.4-fpm-alpine3.16, 9-fpm-alpine3.16, fpm-alpine3.16, 9.4.8-fpm-alpine, 9.4-fpm-alpine, 9-fpm-alpine, fpm-alpine
+Tags: 9.4.8-php8.0-fpm-alpine3.16, 9.4-php8.0-fpm-alpine3.16, 9-php8.0-fpm-alpine3.16, php8.0-fpm-alpine3.16, 9.4.8-fpm-alpine3.16, 9.4-fpm-alpine3.16, 9-fpm-alpine3.16, fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
 Directory: 9.4/php8.0/fpm-alpine3.16
 
-Tags: 9.4.8-php8.0-fpm-alpine3.15, 9.4-php8.0-fpm-alpine3.15, 9-php8.0-fpm-alpine3.15, php8.0-fpm-alpine3.15, 9.4.8-fpm-alpine3.15, 9.4-fpm-alpine3.15, 9-fpm-alpine3.15, fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php8.0/fpm-alpine3.15
-
-Tags: 9.4.8-php7.4-apache-bullseye, 9.4-php7.4-apache-bullseye, 9-php7.4-apache-bullseye, php7.4-apache-bullseye, 9.4.8-php7.4-apache, 9.4-php7.4-apache, 9-php7.4-apache, php7.4-apache, 9.4.8-php7.4, 9.4-php7.4, 9-php7.4, php7.4
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/apache-bullseye
-
-Tags: 9.4.8-php7.4-fpm-bullseye, 9.4-php7.4-fpm-bullseye, 9-php7.4-fpm-bullseye, php7.4-fpm-bullseye, 9.4.8-php7.4-fpm, 9.4-php7.4-fpm, 9-php7.4-fpm, php7.4-fpm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/fpm-bullseye
-
-Tags: 9.4.8-php7.4-apache-buster, 9.4-php7.4-apache-buster, 9-php7.4-apache-buster, php7.4-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/apache-buster
-
-Tags: 9.4.8-php7.4-fpm-buster, 9.4-php7.4-fpm-buster, 9-php7.4-fpm-buster, php7.4-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/fpm-buster
-
-Tags: 9.4.8-php7.4-fpm-alpine3.16, 9.4-php7.4-fpm-alpine3.16, 9-php7.4-fpm-alpine3.16, php7.4-fpm-alpine3.16, 9.4.8-php7.4-fpm-alpine, 9.4-php7.4-fpm-alpine, 9-php7.4-fpm-alpine, php7.4-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/fpm-alpine3.16
-
-Tags: 9.4.8-php7.4-fpm-alpine3.15, 9.4-php7.4-fpm-alpine3.15, 9-php7.4-fpm-alpine3.15, php7.4-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
-Directory: 9.4/php7.4/fpm-alpine3.15
-
 Tags: 9.3.22-php8.1-apache-bullseye, 9.3-php8.1-apache-bullseye, 9.3.22-php8.1-apache, 9.3-php8.1-apache, 9.3.22-php8.1, 9.3-php8.1
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
@@ -144,15 +109,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.1/fpm-buster
 
-Tags: 9.3.22-php8.1-fpm-alpine3.16, 9.3-php8.1-fpm-alpine3.16, 9.3.22-php8.1-fpm-alpine, 9.3-php8.1-fpm-alpine
+Tags: 9.3.22-php8.1-fpm-alpine3.17, 9.3-php8.1-fpm-alpine3.17, 9.3.22-php8.1-fpm-alpine, 9.3-php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php8.1/fpm-alpine3.16
+GitCommit: 606fe5e43280f393bdbbd0f978f0b41669582a29
+Directory: 9.3/php8.1/fpm-alpine3.17
 
-Tags: 9.3.22-php8.1-fpm-alpine3.15, 9.3-php8.1-fpm-alpine3.15
+Tags: 9.3.22-php8.1-fpm-alpine3.16, 9.3-php8.1-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php8.1/fpm-alpine3.15
+Directory: 9.3/php8.1/fpm-alpine3.16
 
 Tags: 9.3.22-php8.0-apache-bullseye, 9.3-php8.0-apache-bullseye, 9.3.22-php8.0-apache, 9.3-php8.0-apache, 9.3.22-php8.0, 9.3-php8.0, 9.3.22-apache-bullseye, 9.3-apache-bullseye, 9.3.22-apache, 9.3-apache, 9.3.22, 9.3
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -174,102 +139,32 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.0/fpm-buster
 
-Tags: 9.3.22-php8.0-fpm-alpine3.16, 9.3-php8.0-fpm-alpine3.16, 9.3.22-php8.0-fpm-alpine, 9.3-php8.0-fpm-alpine, 9.3.22-fpm-alpine3.16, 9.3-fpm-alpine3.16, 9.3.22-fpm-alpine, 9.3-fpm-alpine
+Tags: 9.3.22-php8.0-fpm-alpine3.16, 9.3-php8.0-fpm-alpine3.16, 9.3.22-fpm-alpine3.16, 9.3-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.0/fpm-alpine3.16
 
-Tags: 9.3.22-php8.0-fpm-alpine3.15, 9.3-php8.0-fpm-alpine3.15, 9.3.22-fpm-alpine3.15, 9.3-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php8.0/fpm-alpine3.15
-
-Tags: 9.3.22-php7.4-apache-bullseye, 9.3-php7.4-apache-bullseye, 9.3.22-php7.4-apache, 9.3-php7.4-apache, 9.3.22-php7.4, 9.3-php7.4
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/apache-bullseye
-
-Tags: 9.3.22-php7.4-fpm-bullseye, 9.3-php7.4-fpm-bullseye, 9.3.22-php7.4-fpm, 9.3-php7.4-fpm
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/fpm-bullseye
-
-Tags: 9.3.22-php7.4-apache-buster, 9.3-php7.4-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/apache-buster
-
-Tags: 9.3.22-php7.4-fpm-buster, 9.3-php7.4-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/fpm-buster
-
-Tags: 9.3.22-php7.4-fpm-alpine3.16, 9.3-php7.4-fpm-alpine3.16, 9.3.22-php7.4-fpm-alpine, 9.3-php7.4-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/fpm-alpine3.16
-
-Tags: 9.3.22-php7.4-fpm-alpine3.15, 9.3-php7.4-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
-Directory: 9.3/php7.4/fpm-alpine3.15
-
-Tags: 7.92-php8.0-apache-bullseye, 7-php8.0-apache-bullseye, 7.92-php8.0-apache, 7-php8.0-apache, 7.92-php8.0, 7-php8.0
+Tags: 7.92-php8.0-apache-bullseye, 7-php8.0-apache-bullseye, 7.92-php8.0-apache, 7-php8.0-apache, 7.92-php8.0, 7-php8.0, 7.92-apache-bullseye, 7-apache-bullseye, 7.92-apache, 7-apache, 7.92, 7
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
 Directory: 7/php8.0/apache-bullseye
 
-Tags: 7.92-php8.0-fpm-bullseye, 7-php8.0-fpm-bullseye, 7.92-php8.0-fpm, 7-php8.0-fpm
+Tags: 7.92-php8.0-fpm-bullseye, 7-php8.0-fpm-bullseye, 7.92-php8.0-fpm, 7-php8.0-fpm, 7.92-fpm-bullseye, 7-fpm-bullseye, 7.92-fpm, 7-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
 Directory: 7/php8.0/fpm-bullseye
 
-Tags: 7.92-php8.0-apache-buster, 7-php8.0-apache-buster
+Tags: 7.92-php8.0-apache-buster, 7-php8.0-apache-buster, 7.92-apache-buster, 7-apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
 Directory: 7/php8.0/apache-buster
 
-Tags: 7.92-php8.0-fpm-buster, 7-php8.0-fpm-buster
+Tags: 7.92-php8.0-fpm-buster, 7-php8.0-fpm-buster, 7.92-fpm-buster, 7-fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
 Directory: 7/php8.0/fpm-buster
 
-Tags: 7.92-php8.0-fpm-alpine3.16, 7-php8.0-fpm-alpine3.16, 7.92-php8.0-fpm-alpine, 7-php8.0-fpm-alpine
+Tags: 7.92-php8.0-fpm-alpine3.16, 7-php8.0-fpm-alpine3.16, 7.92-fpm-alpine3.16, 7-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
 Directory: 7/php8.0/fpm-alpine3.16
-
-Tags: 7.92-php8.0-fpm-alpine3.15, 7-php8.0-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php8.0/fpm-alpine3.15
-
-Tags: 7.92-php7.4-apache-bullseye, 7-php7.4-apache-bullseye, 7.92-php7.4-apache, 7-php7.4-apache, 7.92-php7.4, 7-php7.4, 7.92-apache-bullseye, 7-apache-bullseye, 7.92-apache, 7-apache, 7.92, 7
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/apache-bullseye
-
-Tags: 7.92-php7.4-fpm-bullseye, 7-php7.4-fpm-bullseye, 7.92-php7.4-fpm, 7-php7.4-fpm, 7.92-fpm-bullseye, 7-fpm-bullseye, 7.92-fpm, 7-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/fpm-bullseye
-
-Tags: 7.92-php7.4-apache-buster, 7-php7.4-apache-buster, 7.92-apache-buster, 7-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/apache-buster
-
-Tags: 7.92-php7.4-fpm-buster, 7-php7.4-fpm-buster, 7.92-fpm-buster, 7-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/fpm-buster
-
-Tags: 7.92-php7.4-fpm-alpine3.16, 7-php7.4-fpm-alpine3.16, 7.92-php7.4-fpm-alpine, 7-php7.4-fpm-alpine, 7.92-fpm-alpine3.16, 7-fpm-alpine3.16, 7.92-fpm-alpine, 7-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/fpm-alpine3.16
-
-Tags: 7.92-php7.4-fpm-alpine3.15, 7-php7.4-fpm-alpine3.15, 7.92-fpm-alpine3.15, 7-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8a9b7270b27b19f25008fe8ed3791bb422583b23
-Directory: 7/php7.4/fpm-alpine3.15