diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile
index fc8aba97..5b9ee78d 100644
--- a/24/apache/Dockerfile
+++ b/24/apache/Dockerfile
@@ -6,11 +6,11 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
         busybox-static \
+        bzip2 \
         libldap-common \
         libmagickcore-6.q16-6-extra \
+        rsync \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -30,18 +30,18 @@ RUN set -ex; \
         libcurl4-openssl-dev \
         libevent-dev \
         libfreetype6-dev \
+        libgmp-dev \
         libicu-dev \
         libjpeg-dev \
         libldap2-dev \
+        libmagickwand-dev \
         libmcrypt-dev \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
         libwebp-dev \
-        libgmp-dev \
+        libxml2-dev \
+        libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,27 +51,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile
index f222d637..554c75e9 100644
--- a/24/fpm-alpine/Dockerfile
+++ b/24/fpm-alpine/Dockerfile
@@ -5,8 +5,8 @@ FROM php:8.0-fpm-alpine3.16
 RUN set -ex; \
     \
     apk add --no-cache \
-        rsync \
         imagemagick \
+        rsync \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
@@ -20,20 +20,20 @@ RUN set -ex; \
         $PHPIZE_DEPS \
         autoconf \
         freetype-dev \
+        gmp-dev \
         icu-dev \
+        imagemagick-dev \
         libevent-dev \
         libjpeg-turbo-dev \
         libmcrypt-dev \
-        libpng-dev \
         libmemcached-dev \
+        libpng-dev \
+        libwebp-dev \
         libxml2-dev \
         libzip-dev \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
-        imagemagick-dev \
-        libwebp-dev \
-        gmp-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@@ -42,27 +42,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile
index 33346ae2..b170f860 100644
--- a/24/fpm/Dockerfile
+++ b/24/fpm/Dockerfile
@@ -6,11 +6,11 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
         busybox-static \
+        bzip2 \
         libldap-common \
         libmagickcore-6.q16-6-extra \
+        rsync \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -30,18 +30,18 @@ RUN set -ex; \
         libcurl4-openssl-dev \
         libevent-dev \
         libfreetype6-dev \
+        libgmp-dev \
         libicu-dev \
         libjpeg-dev \
         libldap2-dev \
+        libmagickwand-dev \
         libmcrypt-dev \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
         libwebp-dev \
-        libgmp-dev \
+        libxml2-dev \
+        libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,27 +51,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile
index 31bf1eb4..080bb239 100644
--- a/25/apache/Dockerfile
+++ b/25/apache/Dockerfile
@@ -6,11 +6,11 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
         busybox-static \
+        bzip2 \
         libldap-common \
         libmagickcore-6.q16-6-extra \
+        rsync \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -30,18 +30,18 @@ RUN set -ex; \
         libcurl4-openssl-dev \
         libevent-dev \
         libfreetype6-dev \
+        libgmp-dev \
         libicu-dev \
         libjpeg-dev \
         libldap2-dev \
+        libmagickwand-dev \
         libmcrypt-dev \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
         libwebp-dev \
-        libgmp-dev \
+        libxml2-dev \
+        libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,27 +51,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile
index 5fabcb3b..edf1f500 100644
--- a/25/fpm-alpine/Dockerfile
+++ b/25/fpm-alpine/Dockerfile
@@ -5,8 +5,8 @@ FROM php:8.1-fpm-alpine3.16
 RUN set -ex; \
     \
     apk add --no-cache \
-        rsync \
         imagemagick \
+        rsync \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
@@ -20,20 +20,20 @@ RUN set -ex; \
         $PHPIZE_DEPS \
         autoconf \
         freetype-dev \
+        gmp-dev \
         icu-dev \
+        imagemagick-dev \
         libevent-dev \
         libjpeg-turbo-dev \
         libmcrypt-dev \
-        libpng-dev \
         libmemcached-dev \
+        libpng-dev \
+        libwebp-dev \
         libxml2-dev \
         libzip-dev \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
-        imagemagick-dev \
-        libwebp-dev \
-        gmp-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@@ -42,27 +42,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile
index 14702160..224607b7 100644
--- a/25/fpm/Dockerfile
+++ b/25/fpm/Dockerfile
@@ -6,11 +6,11 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
         busybox-static \
+        bzip2 \
         libldap-common \
         libmagickcore-6.q16-6-extra \
+        rsync \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -30,18 +30,18 @@ RUN set -ex; \
         libcurl4-openssl-dev \
         libevent-dev \
         libfreetype6-dev \
+        libgmp-dev \
         libicu-dev \
         libjpeg-dev \
         libldap2-dev \
+        libmagickwand-dev \
         libmcrypt-dev \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
         libwebp-dev \
-        libgmp-dev \
+        libxml2-dev \
+        libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,27 +51,28 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
+        sysvsem \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.22; \
+    pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-5.3.7; \
-    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index a78a76c1..dffd36ab 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -4,8 +4,8 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%3.16
 RUN set -ex; \
     \
     apk add --no-cache \
-        rsync \
         imagemagick \
+        rsync \
     ; \
     \
     rm /var/spool/cron/crontabs/root; \
@@ -19,20 +19,20 @@ RUN set -ex; \
         $PHPIZE_DEPS \
         autoconf \
         freetype-dev \
+        gmp-dev \
         icu-dev \
+        imagemagick-dev \
         libevent-dev \
         libjpeg-turbo-dev \
         libmcrypt-dev \
-        libpng-dev \
         libmemcached-dev \
+        libpng-dev \
+        libwebp-dev \
         libxml2-dev \
         libzip-dev \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
-        imagemagick-dev \
-        libwebp-dev \
-        gmp-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@@ -41,6 +41,7 @@ RUN set -ex; \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
@@ -48,20 +49,19 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-%%APCU_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
-    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index f553dc84..a9de46ce 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -5,11 +5,11 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        rsync \
-        bzip2 \
         busybox-static \
+        bzip2 \
         libldap-common \
         libmagickcore-6.q16-6-extra \
+        rsync \
     ; \
     rm -rf /var/lib/apt/lists/*; \
     \
@@ -29,29 +29,28 @@ RUN set -ex; \
         libcurl4-openssl-dev \
         libevent-dev \
         libfreetype6-dev \
+        libgmp-dev \
         libicu-dev \
         libjpeg-dev \
         libldap2-dev \
+        libmagickwand-dev \
         libmcrypt-dev \
         libmemcached-dev \
         libpng-dev \
         libpq-dev \
-        libxml2-dev \
-        libmagickwand-dev \
-        libzip-dev \
         libwebp-dev \
-        libgmp-dev \
+        libxml2-dev \
+        libzip-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
         gd \
+        gmp \
         intl \
         ldap \
         opcache \
@@ -59,20 +58,19 @@ RUN set -ex; \
         pdo_mysql \
         pdo_pgsql \
         zip \
-        gmp \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-%%APCU_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
-    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
+        imagick \
         memcached \
         redis \
-        imagick \
     ; \
     rm -r /tmp/pear; \
     \
diff --git a/update.sh b/update.sh
index 5bef86b1..57724f90 100755
--- a/update.sh
+++ b/update.sh
@@ -111,8 +111,6 @@ function create_variant() {
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
 		s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
 		s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
-		\@docker-php-ext-configure gmp --with-gmp@d;
-		\@/usr/include/gmp.h@d;
 	' "$dir/Dockerfile"
 
 	# Copy the shell scripts