diff --git a/alpine/3.23/8.2/Dockerfile b/alpine/3.23/8.2/Dockerfile
index 5f39a874..114a7566 100644
--- a/alpine/3.23/8.2/Dockerfile
+++ b/alpine/3.23/8.2/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
         --disable-gd-jis-conv \
         --with-freetype=/usr \
diff --git a/alpine/3.23/8.3/Dockerfile b/alpine/3.23/8.3/Dockerfile
index 5a019b99..a78aceac 100644
--- a/alpine/3.23/8.3/Dockerfile
+++ b/alpine/3.23/8.3/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
       --disable-gd-jis-conv \
       --with-freetype=/usr \
diff --git a/alpine/3.23/8.4/Dockerfile b/alpine/3.23/8.4/Dockerfile
index 1f848b15..cf808cbc 100644
--- a/alpine/3.23/8.4/Dockerfile
+++ b/alpine/3.23/8.4/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
       --disable-gd-jis-conv \
       --with-freetype=/usr \
diff --git a/alpine/3.24/8.2/Dockerfile b/alpine/3.24/8.2/Dockerfile
index 14395647..9b88fbc4 100644
--- a/alpine/3.24/8.2/Dockerfile
+++ b/alpine/3.24/8.2/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
         --disable-gd-jis-conv \
         --with-freetype=/usr \
diff --git a/alpine/3.24/8.3/Dockerfile b/alpine/3.24/8.3/Dockerfile
index 3a913f39..5e379ff0 100644
--- a/alpine/3.24/8.3/Dockerfile
+++ b/alpine/3.24/8.3/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
       --disable-gd-jis-conv \
       --with-freetype=/usr \
diff --git a/alpine/3.24/8.4/Dockerfile b/alpine/3.24/8.4/Dockerfile
index 35de77dc..a99829bf 100644
--- a/alpine/3.24/8.4/Dockerfile
+++ b/alpine/3.24/8.4/Dockerfile
@@ -107,20 +107,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
       --disable-gd-jis-conv \
       --with-freetype=/usr \
diff --git a/alpine/3.24/8.5/Dockerfile b/alpine/3.24/8.5/Dockerfile
index 87a05dec..0b57e454 100644
--- a/alpine/3.24/8.5/Dockerfile
+++ b/alpine/3.24/8.5/Dockerfile
@@ -108,20 +108,16 @@ RUN apk update \
         libstdc++ \
         openssl-dev \
         zlib-dev \
-        scdoc \
         ${PHP_RUN_DEPS} \
     && apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
     && apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
     && rm -rf /var/lib/apt/lists/ \
     && cd /tmp \
-    && git clone --depth 1 --branch v3.0.0_rc7 https://github.com/alpinelinux/apk-tools.git apk-tools-v3.0.0_rc7 \
-    && cd apk-tools-v3.0.0_rc7 && make LUA=no && make LUA=no install \
-    && cd /tmp \
     && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \
     && tar xzf icu4c-74_1-src.tgz \
     && cd icu/source && ./configure --prefix=/usr && make && make install \
     && cd /tmp \
-    && rm -rf /tmp/apk-tools-v3.0.0_rc7 /tmp/icu4c-74_1-src.tgz /tmp/icu \
+    && rm -rf /tmp/icu4c-74_1-src.tgz /tmp/icu \
     && docker-php-ext-configure gd \
       --disable-gd-jis-conv \
       --with-freetype=/usr \