Update drupal

[tianon]

Changes:

• docker-library/drupal@5715c8b: Merge pull request Drop PHP 7.4 (EOL), add Alpine 3.17 drupal#229 from infosiftr/php7.4eol-alpine3.17
• docker-library/drupal@606fe5e: Drop PHP 7.4 (EOL), add Alpine 3.17
• docker-library/drupal@14fb628: Use new "bashbrew" composite action

[github-actions]

Diff for f38754e:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index c905afc..249c2ab 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,96 +1,31 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/drupal.git
 
-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-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-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
-
-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-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-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-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-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-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-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-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-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: 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-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-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: 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-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-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-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
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
@@ -101,12 +36,7 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.0/apache-buster
 
-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-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
@@ -131,15 +61,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.1/apache-buster
 
-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.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-bullseye, 9.3-php8.1-fpm-bullseye, 9.3.22-php8.1-fpm, 9.3-php8.1-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -151,36 +81,6 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: d8bbe7584919ae928f8910faaaa2397ec9a23417
 Directory: 9.3/php8.1/fpm-buster
 
-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-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-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.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-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-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-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
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
@@ -191,12 +91,7 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
 Directory: 9.4/php8.0/apache-buster
 
-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-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
@@ -221,15 +116,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 0bc267208f3f1405b8441588a48e0004508f65f8
 Directory: 9.4/php8.1/apache-buster
 
-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.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-bullseye, 9.4-php8.1-fpm-bullseye, 9-php8.1-fpm-bullseye, php8.1-fpm-bullseye, 9.4.8-php8.1-fpm, 9.4-php8.1-fpm, 9-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -251,15 +146,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 4c74bbfaed173fd090b7819d1f9f52e3b8896860
 Directory: 10.0-rc/php8.1/apache-buster
 
-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: 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-bullseye, 10.0-rc-php8.1-fpm-bullseye, rc-php8.1-fpm-bullseye, 10.0.0-rc1-php8.1-fpm, 10.0-rc-php8.1-fpm, rc-php8.1-fpm, 10.0.0-rc1-fpm-bullseye, 10.0-rc-fpm-bullseye, rc-fpm-bullseye, 10.0.0-rc1-fpm, 10.0-rc-fpm, rc-fpm
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 6591805..c7969df 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,28 +3,14 @@ drupal:7-apache
 drupal:7-apache-bullseye
 drupal:7-apache-buster
 drupal:7-fpm
-drupal:7-fpm-alpine
-drupal:7-fpm-alpine3.15
 drupal:7-fpm-alpine3.16
 drupal:7-fpm-bullseye
 drupal:7-fpm-buster
-drupal:7-php7.4
-drupal:7-php7.4-apache
-drupal:7-php7.4-apache-bullseye
-drupal:7-php7.4-apache-buster
-drupal:7-php7.4-fpm
-drupal:7-php7.4-fpm-alpine
-drupal:7-php7.4-fpm-alpine3.15
-drupal:7-php7.4-fpm-alpine3.16
-drupal:7-php7.4-fpm-bullseye
-drupal:7-php7.4-fpm-buster
 drupal:7-php8.0
 drupal:7-php8.0-apache
 drupal:7-php8.0-apache-bullseye
 drupal:7-php8.0-apache-buster
 drupal:7-php8.0-fpm
-drupal:7-php8.0-fpm-alpine
-drupal:7-php8.0-fpm-alpine3.15
 drupal:7-php8.0-fpm-alpine3.16
 drupal:7-php8.0-fpm-bullseye
 drupal:7-php8.0-fpm-buster
@@ -33,28 +19,14 @@ drupal:7.92-apache
 drupal:7.92-apache-bullseye
 drupal:7.92-apache-buster
 drupal:7.92-fpm
-drupal:7.92-fpm-alpine
-drupal:7.92-fpm-alpine3.15
 drupal:7.92-fpm-alpine3.16
 drupal:7.92-fpm-bullseye
 drupal:7.92-fpm-buster
-drupal:7.92-php7.4
-drupal:7.92-php7.4-apache
-drupal:7.92-php7.4-apache-bullseye
-drupal:7.92-php7.4-apache-buster
-drupal:7.92-php7.4-fpm
-drupal:7.92-php7.4-fpm-alpine
-drupal:7.92-php7.4-fpm-alpine3.15
-drupal:7.92-php7.4-fpm-alpine3.16
-drupal:7.92-php7.4-fpm-bullseye
-drupal:7.92-php7.4-fpm-buster
 drupal:7.92-php8.0
 drupal:7.92-php8.0-apache
 drupal:7.92-php8.0-apache-bullseye
 drupal:7.92-php8.0-apache-buster
 drupal:7.92-php8.0-fpm
-drupal:7.92-php8.0-fpm-alpine
-drupal:7.92-php8.0-fpm-alpine3.15
 drupal:7.92-php8.0-fpm-alpine3.16
 drupal:7.92-php8.0-fpm-bullseye
 drupal:7.92-php8.0-fpm-buster
@@ -63,28 +35,14 @@ drupal:9-apache
 drupal:9-apache-bullseye
 drupal:9-apache-buster
 drupal:9-fpm
-drupal:9-fpm-alpine
-drupal:9-fpm-alpine3.15
 drupal:9-fpm-alpine3.16
 drupal:9-fpm-bullseye
 drupal:9-fpm-buster
-drupal:9-php7.4
-drupal:9-php7.4-apache
-drupal:9-php7.4-apache-bullseye
-drupal:9-php7.4-apache-buster
-drupal:9-php7.4-fpm
-drupal:9-php7.4-fpm-alpine
-drupal:9-php7.4-fpm-alpine3.15
-drupal:9-php7.4-fpm-alpine3.16
-drupal:9-php7.4-fpm-bullseye
-drupal:9-php7.4-fpm-buster
 drupal:9-php8.0
 drupal:9-php8.0-apache
 drupal:9-php8.0-apache-bullseye
 drupal:9-php8.0-apache-buster
 drupal:9-php8.0-fpm
-drupal:9-php8.0-fpm-alpine
-drupal:9-php8.0-fpm-alpine3.15
 drupal:9-php8.0-fpm-alpine3.16
 drupal:9-php8.0-fpm-bullseye
 drupal:9-php8.0-fpm-buster
@@ -94,8 +52,8 @@ drupal:9-php8.1-apache-bullseye
 drupal:9-php8.1-apache-buster
 drupal:9-php8.1-fpm
 drupal:9-php8.1-fpm-alpine
-drupal:9-php8.1-fpm-alpine3.15
 drupal:9-php8.1-fpm-alpine3.16
+drupal:9-php8.1-fpm-alpine3.17
 drupal:9-php8.1-fpm-bullseye
 drupal:9-php8.1-fpm-buster
 drupal:9.3
@@ -103,28 +61,14 @@ drupal:9.3-apache
 drupal:9.3-apache-bullseye
 drupal:9.3-apache-buster
 drupal:9.3-fpm
-drupal:9.3-fpm-alpine
-drupal:9.3-fpm-alpine3.15
 drupal:9.3-fpm-alpine3.16
 drupal:9.3-fpm-bullseye
 drupal:9.3-fpm-buster
-drupal:9.3-php7.4
-drupal:9.3-php7.4-apache
-drupal:9.3-php7.4-apache-bullseye
-drupal:9.3-php7.4-apache-buster
-drupal:9.3-php7.4-fpm
-drupal:9.3-php7.4-fpm-alpine
-drupal:9.3-php7.4-fpm-alpine3.15
-drupal:9.3-php7.4-fpm-alpine3.16
-drupal:9.3-php7.4-fpm-bullseye
-drupal:9.3-php7.4-fpm-buster
 drupal:9.3-php8.0
 drupal:9.3-php8.0-apache
 drupal:9.3-php8.0-apache-bullseye
 drupal:9.3-php8.0-apache-buster
 drupal:9.3-php8.0-fpm
-drupal:9.3-php8.0-fpm-alpine
-drupal:9.3-php8.0-fpm-alpine3.15
 drupal:9.3-php8.0-fpm-alpine3.16
 drupal:9.3-php8.0-fpm-bullseye
 drupal:9.3-php8.0-fpm-buster
@@ -134,8 +78,8 @@ drupal:9.3-php8.1-apache-bullseye
 drupal:9.3-php8.1-apache-buster
 drupal:9.3-php8.1-fpm
 drupal:9.3-php8.1-fpm-alpine
-drupal:9.3-php8.1-fpm-alpine3.15
 drupal:9.3-php8.1-fpm-alpine3.16
+drupal:9.3-php8.1-fpm-alpine3.17
 drupal:9.3-php8.1-fpm-bullseye
 drupal:9.3-php8.1-fpm-buster
 drupal:9.3.22
@@ -143,28 +87,14 @@ drupal:9.3.22-apache
 drupal:9.3.22-apache-bullseye
 drupal:9.3.22-apache-buster
 drupal:9.3.22-fpm
-drupal:9.3.22-fpm-alpine
-drupal:9.3.22-fpm-alpine3.15
 drupal:9.3.22-fpm-alpine3.16
 drupal:9.3.22-fpm-bullseye
 drupal:9.3.22-fpm-buster
-drupal:9.3.22-php7.4
-drupal:9.3.22-php7.4-apache
-drupal:9.3.22-php7.4-apache-bullseye
-drupal:9.3.22-php7.4-apache-buster
-drupal:9.3.22-php7.4-fpm
-drupal:9.3.22-php7.4-fpm-alpine
-drupal:9.3.22-php7.4-fpm-alpine3.15
-drupal:9.3.22-php7.4-fpm-alpine3.16
-drupal:9.3.22-php7.4-fpm-bullseye
-drupal:9.3.22-php7.4-fpm-buster
 drupal:9.3.22-php8.0
 drupal:9.3.22-php8.0-apache
 drupal:9.3.22-php8.0-apache-bullseye
 drupal:9.3.22-php8.0-apache-buster
 drupal:9.3.22-php8.0-fpm
-drupal:9.3.22-php8.0-fpm-alpine
-drupal:9.3.22-php8.0-fpm-alpine3.15
 drupal:9.3.22-php8.0-fpm-alpine3.16
 drupal:9.3.22-php8.0-fpm-bullseye
 drupal:9.3.22-php8.0-fpm-buster
@@ -174,8 +104,8 @@ drupal:9.3.22-php8.1-apache-bullseye
 drupal:9.3.22-php8.1-apache-buster
 drupal:9.3.22-php8.1-fpm
 drupal:9.3.22-php8.1-fpm-alpine
-drupal:9.3.22-php8.1-fpm-alpine3.15
 drupal:9.3.22-php8.1-fpm-alpine3.16
+drupal:9.3.22-php8.1-fpm-alpine3.17
 drupal:9.3.22-php8.1-fpm-bullseye
 drupal:9.3.22-php8.1-fpm-buster
 drupal:9.4
@@ -183,28 +113,14 @@ drupal:9.4-apache
 drupal:9.4-apache-bullseye
 drupal:9.4-apache-buster
 drupal:9.4-fpm
-drupal:9.4-fpm-alpine
-drupal:9.4-fpm-alpine3.15
 drupal:9.4-fpm-alpine3.16
 drupal:9.4-fpm-bullseye
 drupal:9.4-fpm-buster
-drupal:9.4-php7.4
-drupal:9.4-php7.4-apache
-drupal:9.4-php7.4-apache-bullseye
-drupal:9.4-php7.4-apache-buster
-drupal:9.4-php7.4-fpm
-drupal:9.4-php7.4-fpm-alpine
-drupal:9.4-php7.4-fpm-alpine3.15
-drupal:9.4-php7.4-fpm-alpine3.16
-drupal:9.4-php7.4-fpm-bullseye
-drupal:9.4-php7.4-fpm-buster
 drupal:9.4-php8.0
 drupal:9.4-php8.0-apache
 drupal:9.4-php8.0-apache-bullseye
 drupal:9.4-php8.0-apache-buster
 drupal:9.4-php8.0-fpm
-drupal:9.4-php8.0-fpm-alpine
-drupal:9.4-php8.0-fpm-alpine3.15
 drupal:9.4-php8.0-fpm-alpine3.16
 drupal:9.4-php8.0-fpm-bullseye
 drupal:9.4-php8.0-fpm-buster
@@ -214,8 +130,8 @@ drupal:9.4-php8.1-apache-bullseye
 drupal:9.4-php8.1-apache-buster
 drupal:9.4-php8.1-fpm
 drupal:9.4-php8.1-fpm-alpine
-drupal:9.4-php8.1-fpm-alpine3.15
 drupal:9.4-php8.1-fpm-alpine3.16
+drupal:9.4-php8.1-fpm-alpine3.17
 drupal:9.4-php8.1-fpm-bullseye
 drupal:9.4-php8.1-fpm-buster
 drupal:9.4.8
@@ -223,28 +139,14 @@ drupal:9.4.8-apache
 drupal:9.4.8-apache-bullseye
 drupal:9.4.8-apache-buster
 drupal:9.4.8-fpm
-drupal:9.4.8-fpm-alpine
-drupal:9.4.8-fpm-alpine3.15
 drupal:9.4.8-fpm-alpine3.16
 drupal:9.4.8-fpm-bullseye
 drupal:9.4.8-fpm-buster
-drupal:9.4.8-php7.4
-drupal:9.4.8-php7.4-apache
-drupal:9.4.8-php7.4-apache-bullseye
-drupal:9.4.8-php7.4-apache-buster
-drupal:9.4.8-php7.4-fpm
-drupal:9.4.8-php7.4-fpm-alpine
-drupal:9.4.8-php7.4-fpm-alpine3.15
-drupal:9.4.8-php7.4-fpm-alpine3.16
-drupal:9.4.8-php7.4-fpm-bullseye
-drupal:9.4.8-php7.4-fpm-buster
 drupal:9.4.8-php8.0
 drupal:9.4.8-php8.0-apache
 drupal:9.4.8-php8.0-apache-bullseye
 drupal:9.4.8-php8.0-apache-buster
 drupal:9.4.8-php8.0-fpm
-drupal:9.4.8-php8.0-fpm-alpine
-drupal:9.4.8-php8.0-fpm-alpine3.15
 drupal:9.4.8-php8.0-fpm-alpine3.16
 drupal:9.4.8-php8.0-fpm-bullseye
 drupal:9.4.8-php8.0-fpm-buster
@@ -254,8 +156,8 @@ drupal:9.4.8-php8.1-apache-bullseye
 drupal:9.4.8-php8.1-apache-buster
 drupal:9.4.8-php8.1-fpm
 drupal:9.4.8-php8.1-fpm-alpine
-drupal:9.4.8-php8.1-fpm-alpine3.15
 drupal:9.4.8-php8.1-fpm-alpine3.16
+drupal:9.4.8-php8.1-fpm-alpine3.17
 drupal:9.4.8-php8.1-fpm-bullseye
 drupal:9.4.8-php8.1-fpm-buster
 drupal:10.0-rc
@@ -264,8 +166,8 @@ drupal:10.0-rc-apache-bullseye
 drupal:10.0-rc-apache-buster
 drupal:10.0-rc-fpm
 drupal:10.0-rc-fpm-alpine
-drupal:10.0-rc-fpm-alpine3.15
 drupal:10.0-rc-fpm-alpine3.16
+drupal:10.0-rc-fpm-alpine3.17
 drupal:10.0-rc-fpm-bullseye
 drupal:10.0-rc-fpm-buster
 drupal:10.0-rc-php8.1
@@ -274,8 +176,8 @@ drupal:10.0-rc-php8.1-apache-bullseye
 drupal:10.0-rc-php8.1-apache-buster
 drupal:10.0-rc-php8.1-fpm
 drupal:10.0-rc-php8.1-fpm-alpine
-drupal:10.0-rc-php8.1-fpm-alpine3.15
 drupal:10.0-rc-php8.1-fpm-alpine3.16
+drupal:10.0-rc-php8.1-fpm-alpine3.17
 drupal:10.0-rc-php8.1-fpm-bullseye
 drupal:10.0-rc-php8.1-fpm-buster
 drupal:10.0.0-rc1
@@ -284,8 +186,8 @@ drupal:10.0.0-rc1-apache-bullseye
 drupal:10.0.0-rc1-apache-buster
 drupal:10.0.0-rc1-fpm
 drupal:10.0.0-rc1-fpm-alpine
-drupal:10.0.0-rc1-fpm-alpine3.15
 drupal:10.0.0-rc1-fpm-alpine3.16
+drupal:10.0.0-rc1-fpm-alpine3.17
 drupal:10.0.0-rc1-fpm-bullseye
 drupal:10.0.0-rc1-fpm-buster
 drupal:10.0.0-rc1-php8.1
@@ -294,37 +196,23 @@ drupal:10.0.0-rc1-php8.1-apache-bullseye
 drupal:10.0.0-rc1-php8.1-apache-buster
 drupal:10.0.0-rc1-php8.1-fpm
 drupal:10.0.0-rc1-php8.1-fpm-alpine
-drupal:10.0.0-rc1-php8.1-fpm-alpine3.15
 drupal:10.0.0-rc1-php8.1-fpm-alpine3.16
+drupal:10.0.0-rc1-php8.1-fpm-alpine3.17
 drupal:10.0.0-rc1-php8.1-fpm-bullseye
 drupal:10.0.0-rc1-php8.1-fpm-buster
 drupal:apache
 drupal:apache-bullseye
 drupal:apache-buster
 drupal:fpm
-drupal:fpm-alpine
-drupal:fpm-alpine3.15
 drupal:fpm-alpine3.16
 drupal:fpm-bullseye
 drupal:fpm-buster
 drupal:latest
-drupal:php7.4
-drupal:php7.4-apache
-drupal:php7.4-apache-bullseye
-drupal:php7.4-apache-buster
-drupal:php7.4-fpm
-drupal:php7.4-fpm-alpine
-drupal:php7.4-fpm-alpine3.15
-drupal:php7.4-fpm-alpine3.16
-drupal:php7.4-fpm-bullseye
-drupal:php7.4-fpm-buster
 drupal:php8.0
 drupal:php8.0-apache
 drupal:php8.0-apache-bullseye
 drupal:php8.0-apache-buster
 drupal:php8.0-fpm
-drupal:php8.0-fpm-alpine
-drupal:php8.0-fpm-alpine3.15
 drupal:php8.0-fpm-alpine3.16
 drupal:php8.0-fpm-bullseye
 drupal:php8.0-fpm-buster
@@ -334,8 +222,8 @@ drupal:php8.1-apache-bullseye
 drupal:php8.1-apache-buster
 drupal:php8.1-fpm
 drupal:php8.1-fpm-alpine
-drupal:php8.1-fpm-alpine3.15
 drupal:php8.1-fpm-alpine3.16
+drupal:php8.1-fpm-alpine3.17
 drupal:php8.1-fpm-bullseye
 drupal:php8.1-fpm-buster
 drupal:rc
@@ -344,8 +232,8 @@ drupal:rc-apache-bullseye
 drupal:rc-apache-buster
 drupal:rc-fpm
 drupal:rc-fpm-alpine
-drupal:rc-fpm-alpine3.15
 drupal:rc-fpm-alpine3.16
+drupal:rc-fpm-alpine3.17
 drupal:rc-fpm-bullseye
 drupal:rc-fpm-buster
 drupal:rc-php8.1
@@ -354,7 +242,7 @@ drupal:rc-php8.1-apache-bullseye
 drupal:rc-php8.1-apache-buster
 drupal:rc-php8.1-fpm
 drupal:rc-php8.1-fpm-alpine
-drupal:rc-php8.1-fpm-alpine3.15
 drupal:rc-php8.1-fpm-alpine3.16
+drupal:rc-php8.1-fpm-alpine3.17
 drupal:rc-php8.1-fpm-bullseye
 drupal:rc-php8.1-fpm-buster
diff --git a/drupal_7-apache-buster/Dockerfile b/drupal_7-apache-buster/Dockerfile
index 37caa5b..fb5c141 100644
--- a/drupal_7-apache-buster/Dockerfile
+++ b/drupal_7-apache-buster/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:7.4-apache-buster
+FROM php:8.0-apache-buster
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile
deleted file mode 100644
index 8969174..0000000
diff --git a/drupal_7-fpm-alpine3.15/Dockerfile b/drupal_7-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 849e53e..0000000
diff --git a/drupal_7-php8.0-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine3.16/Dockerfile
similarity index 100%
rename from drupal_7-php8.0-fpm-alpine/Dockerfile
rename to drupal_7-fpm-alpine3.16/Dockerfile
diff --git a/drupal_7-fpm-buster/Dockerfile b/drupal_7-fpm-buster/Dockerfile
index f42c1ab..3f641a0 100644
--- a/drupal_7-fpm-buster/Dockerfile
+++ b/drupal_7-fpm-buster/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:7.4-fpm-buster
+FROM php:8.0-fpm-buster
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
index 9bd4cad..7be8ec4 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:7.4-fpm-bullseye
+FROM php:8.0-fpm-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_7-php8.0-apache-buster/Dockerfile b/drupal_7-php8.0-apache-buster/Dockerfile
deleted file mode 100644
index fb5c141..0000000
diff --git a/drupal_7-php8.0-fpm-alpine3.15/Dockerfile b/drupal_7-php8.0-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 9a047c1..0000000
diff --git a/drupal_7-php8.0-fpm-buster/Dockerfile b/drupal_7-php8.0-fpm-buster/Dockerfile
deleted file mode 100644
index 3f641a0..0000000
diff --git a/drupal_7-php8.0-fpm/Dockerfile b/drupal_7-php8.0-fpm/Dockerfile
deleted file mode 100644
index 7be8ec4..0000000
diff --git a/drupal_7-php8.0/Dockerfile b/drupal_7-php8.0/Dockerfile
deleted file mode 100644
index 2f7d1fe..0000000
diff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile
index 40127ef..2f7d1fe 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:7.4-apache-bullseye
+FROM php:8.0-apache-bullseye
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_9.3-fpm-alpine3.15/Dockerfile b/drupal_9.3-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index e884508..0000000
diff --git a/drupal_9.3-fpm-alpine/Dockerfile b/drupal_9.3-fpm-alpine3.16/Dockerfile
similarity index 100%
rename from drupal_9.3-fpm-alpine/Dockerfile
rename to drupal_9.3-fpm-alpine3.16/Dockerfile
diff --git a/drupal_9.3-php7.4-apache-buster/Dockerfile b/drupal_9.3-php7.4-apache-buster/Dockerfile
deleted file mode 100644
index 4215c18..0000000
diff --git a/drupal_9.3-php7.4-fpm-alpine/Dockerfile b/drupal_9.3-php7.4-fpm-alpine/Dockerfile
deleted file mode 100644
index 2278d35..0000000
diff --git a/drupal_9.3-php7.4-fpm-alpine3.15/Dockerfile b/drupal_9.3-php7.4-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index a58d25f..0000000
diff --git a/drupal_9.3-php7.4-fpm-buster/Dockerfile b/drupal_9.3-php7.4-fpm-buster/Dockerfile
deleted file mode 100644
index 3d09951..0000000
diff --git a/drupal_9.3-php7.4-fpm/Dockerfile b/drupal_9.3-php7.4-fpm/Dockerfile
deleted file mode 100644
index 71a661e..0000000
diff --git a/drupal_9.3-php7.4/Dockerfile b/drupal_9.3-php7.4/Dockerfile
deleted file mode 100644
index 7ea1850..0000000
diff --git a/drupal_9.3-php8.1-fpm-alpine/Dockerfile b/drupal_9.3-php8.1-fpm-alpine/Dockerfile
index f693ffc..2a50025 100644
--- a/drupal_9.3-php8.1-fpm-alpine/Dockerfile
+++ b/drupal_9.3-php8.1-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.17
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_9.3-php8.1-fpm-alpine3.15/Dockerfile b/drupal_9.3-php8.1-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index f3f04a7..0000000
diff --git a/drupal_9.3-php8.1-fpm-alpine/Dockerfile b/drupal_9.3-php8.1-fpm-alpine3.16/Dockerfile
similarity index 100%
copy from drupal_9.3-php8.1-fpm-alpine/Dockerfile
copy to drupal_9.3-php8.1-fpm-alpine3.16/Dockerfile
diff --git a/drupal_fpm-alpine3.15/Dockerfile b/drupal_fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 1b6830d..0000000
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine3.16/Dockerfile
similarity index 100%
rename from drupal_fpm-alpine/Dockerfile
rename to drupal_fpm-alpine3.16/Dockerfile
diff --git a/drupal_php7.4-apache-buster/Dockerfile b/drupal_php7.4-apache-buster/Dockerfile
deleted file mode 100644
index 6869e5a..0000000
diff --git a/drupal_php7.4-fpm-alpine/Dockerfile b/drupal_php7.4-fpm-alpine/Dockerfile
deleted file mode 100644
index fdc6787..0000000
diff --git a/drupal_php7.4-fpm-alpine3.15/Dockerfile b/drupal_php7.4-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index f503785..0000000
diff --git a/drupal_php7.4-fpm-buster/Dockerfile b/drupal_php7.4-fpm-buster/Dockerfile
deleted file mode 100644
index c69abe1..0000000
diff --git a/drupal_php7.4-fpm/Dockerfile b/drupal_php7.4-fpm/Dockerfile
deleted file mode 100644
index 737b862..0000000
diff --git a/drupal_php7.4/Dockerfile b/drupal_php7.4/Dockerfile
deleted file mode 100644
index 6e8c48a..0000000
diff --git a/drupal_php8.1-fpm-alpine/Dockerfile b/drupal_php8.1-fpm-alpine/Dockerfile
index 03f7dcc..b07dbad 100644
--- a/drupal_php8.1-fpm-alpine/Dockerfile
+++ b/drupal_php8.1-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.17
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_php8.1-fpm-alpine3.15/Dockerfile b/drupal_php8.1-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 3778fde..0000000
diff --git a/drupal_php8.1-fpm-alpine/Dockerfile b/drupal_php8.1-fpm-alpine3.16/Dockerfile
similarity index 100%
copy from drupal_php8.1-fpm-alpine/Dockerfile
copy to drupal_php8.1-fpm-alpine3.16/Dockerfile
diff --git a/drupal_rc-fpm-alpine/Dockerfile b/drupal_rc-fpm-alpine/Dockerfile
index 92b4721..9b2c7c2 100644
--- a/drupal_rc-fpm-alpine/Dockerfile
+++ b/drupal_rc-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # from https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.1-fpm-alpine3.16
+FROM php:8.1-fpm-alpine3.17
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/drupal_rc-fpm-alpine3.15/Dockerfile b/drupal_rc-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index b31c8e7..0000000
diff --git a/drupal_rc-fpm-alpine/Dockerfile b/drupal_rc-fpm-alpine3.16/Dockerfile
similarity index 100%
copy from drupal_rc-fpm-alpine/Dockerfile
copy to drupal_rc-fpm-alpine3.16/Dockerfile

Relevant Maintainers:

• drupal: @tianon @yosifkit