diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 17b02f4..3f9a2e0 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -24,11 +24,11 @@ RUN --mount=type=cache,target=/var/cache/apk \
     php${PHP_VERSION} php${PHP_VERSION}-fpm
 
 # REMOVE CURRENT POOL FIRST
-RUN rm -rf /etc/php${PHP_VERSION}/php-fpm.d
+RUN rm -rf /etc/php${PHP_VERSION}/php-fpm*
 
 # COPY CONFIGURATION FILES
-ADD ./etc/php/fpm/php-fpm.conf /etc/php${PHP_VERSION}/php-fpm.conf
-ADD ./etc/php/fpm/pool.d /etc/php/fpm/pool.d 
+RUN mkdir -p /etc/php/fpm
+ADD ./etc/php /etc/php
 ADD ./etc/services.d/php-fpm-alpine /etc/services.d/php-fpm
 
 # CREATE SYMLINKS TO /usr/bin/php IN CASE IT IS NOT EXISTS
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 1ae97dc..bca7c9a 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -23,12 +23,11 @@ RUN --mount=type=cache,target=/var/cache/apt/archives \
     apt -y install \
     php${PHP_VERSION}-cli php${PHP_VERSION}-common php${PHP_VERSION}-fpm
 
-# REMOVE CURRENT POOL FIRST
-RUN rm -rf /etc/php/${PHP_VERSION}/fpm/pool.d
+# REMOVE DEFAULT PHP FPM
+RUN rm -rf /etc/php/${PHP_VERSION}/fpm
 
 # COPY CONFIGURATION FILES
-ADD ./etc/php/fpm/php-fpm.conf /etc/php/${PHP_VERSION}/fpm/php-fpm.conf
-ADD ./etc/php/fpm/pool.d /etc/php/fpm/pool.d 
+ADD ./etc/php/fpm /etc/php/fpm
 ADD ./etc/services.d/php-fpm /etc/services.d/php-fpm
 
 # CREATE SYMLINKS TO /usr/bin/php IN CASE IT IS NOT EXISTS
diff --git a/etc/services.d/php-fpm-alpine/run b/etc/services.d/php-fpm-alpine/run
index f762c40..f4db1b0 100644
--- a/etc/services.d/php-fpm-alpine/run
+++ b/etc/services.d/php-fpm-alpine/run
@@ -1,2 +1,2 @@
 #!/command/with-contenv sh
-php-fpm$PHP_VERSION -F -O --allow-to-run-as-root -c /etc/php$PHP_VERSION/php-fpm.conf
+$PHP_FPM_BIN -F -O --allow-to-run-as-root -c /etc/php${PHP_VERSION} -y /etc/php/fpm/php-fpm.conf
diff --git a/etc/services.d/php-fpm/run b/etc/services.d/php-fpm/run
index f9b5a46..dc07bf9 100644
--- a/etc/services.d/php-fpm/run
+++ b/etc/services.d/php-fpm/run
@@ -1,2 +1,2 @@
 #!/command/with-contenv sh
-$PHP_FPM_BIN -F -O --allow-to-run-as-root -c /etc/php/$PHP_VERSION/fpm -y /etc/php/${PHP_VERSION}/fpm/php-fpm.conf
+$PHP_FPM_BIN -F -O --allow-to-run-as-root -c /etc/php/${PHP_VERSION}/cli -y /etc/php/${PHP_VERSION}/fpm/php-fpm.conf