diff --git a/006-build-php-fpm.sh b/006-build-php-fpm.sh
index 8bbe3214..1898b87a 100755
--- a/006-build-php-fpm.sh
+++ b/006-build-php-fpm.sh
@@ -25,11 +25,4 @@ docker run \
 	--name ${NAME} \
 	--network-alias=phpfpm \
 	-h phpfpm \
-	php:${PHPVERS}
-
-echo "Installing intl and mysql pdo extension..."
-docker exec ${NAME} /bin/bash -c "apt-get update && apt-get install -y zlib1g-dev libicu-dev g++ libidn11-dev"
-docker exec ${NAME} docker-php-ext-configure intl pdo pdo_mysql
-docker exec ${NAME} docker-php-ext-install intl pdo pdo_mysql
-echo "Restarting container..."
-docker restart ${NAME}
+	andryyy/mailcow-dockerized:phpfpm
diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/php-fpm/Dockerfile
new file mode 100644
index 00000000..ee556c49
--- /dev/null
+++ b/data/Dockerfiles/php-fpm/Dockerfile
@@ -0,0 +1,15 @@
+FROM php:7.1-fpm
+MAINTAINER Andre Peters <andre.peters@servercow.de>
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+        && apt-get install -y zlib1g-dev libicu-dev g++ libidn11-dev
+
+RUN docker-php-ext-configure intl
+RUN docker-php-ext-install intl pdo pdo_mysql
+
+WORKDIR /var/www/html
+
+EXPOSE 9000
+CMD ["php-fpm"]