diff --git a/8.2/Dockerfile b/8.2/Dockerfile
index 8c92a1d..1fe26ff 100644
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@@ -50,6 +50,9 @@ RUN apk add --update --no-cache \
         freetype-dev \
         libjpeg-turbo-dev \
         libpng-dev \
+        # Dependancy for gmp \
+        gmp \
+        libgmpxx \
         # Dependancy for intl \
         icu-libs \
         libintl \
@@ -240,11 +243,11 @@ RUN if [ "${DOCKER_PHP_ENABLE_POSTGRESQL}" != "off" ]; then \
           libpq && \
       # Build dependancies for PostgreSQL \
       apk add --update --no-cache --virtual .docker-php-postgresql-dependancies \
-          postgresql-client \
-          postgresql-dev && \
+          libpq-dev && \
       docker-php-ext-configure pdo_pgsql && \
       docker-php-ext-configure pgsql && \
-      docker-php-ext-install pdo_pgsql \
+      docker-php-ext-install \
+          pdo_pgsql \
           pgsql && \
       apk del .docker-php-postgresql-dependancies && \
       php -m; \
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
index b0e4bc2..686d299 100644
--- a/8.3/Dockerfile
+++ b/8.3/Dockerfile
@@ -254,11 +254,11 @@ RUN if [ "${DOCKER_PHP_ENABLE_POSTGRESQL}" != "off" ]; then \
           libpq && \
       # Build dependancies for PostgreSQL \
       apk add --update --no-cache --virtual .docker-php-postgresql-dependancies \
-          postgresql-client \
-          postgresql-dev && \
+          libpq-dev && \
       docker-php-ext-configure pdo_pgsql && \
       docker-php-ext-configure pgsql && \
-      docker-php-ext-install pdo_pgsql \
+      docker-php-ext-install \
+          pdo_pgsql \
           pgsql && \
       apk del .docker-php-postgresql-dependancies && \
       php -m; \