diff --git a/Dockerfile.template b/Dockerfile.template
index 0ca14457..1355ea89 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -67,7 +67,7 @@ RUN set -ex; \
 	tar -xzf piwik.tar.gz -C /usr/src/; \
 	rm piwik.tar.gz
 
-COPY php.ini /usr/local/etc/php/php.ini
+COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
 
 RUN set -ex; \
 	curl -fsSL -o /usr/src/piwik/misc/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; \
diff --git a/apache/Dockerfile b/apache/Dockerfile
index 510c9935..e427686c 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -67,7 +67,7 @@ RUN set -ex; \
 	tar -xzf piwik.tar.gz -C /usr/src/; \
 	rm piwik.tar.gz
 
-COPY php.ini /usr/local/etc/php/php.ini
+COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
 
 RUN set -ex; \
 	curl -fsSL -o /usr/src/piwik/misc/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 00000000..b92388c7
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+if [ ! -e piwik.php ]; then
+	tar cf - --one-file-system -C /usr/src/piwik . | tar xf -
+	chown -R www-data .
+fi
+
+exec "$@"
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index a76936f9..b522b7a3 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -67,7 +67,7 @@ RUN set -ex; \
 	tar -xzf piwik.tar.gz -C /usr/src/; \
 	rm piwik.tar.gz
 
-COPY php.ini /usr/local/etc/php/php.ini
+COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
 
 RUN set -ex; \
 	curl -fsSL -o /usr/src/piwik/misc/GeoIPCity.dat.gz https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; \
diff --git a/php.ini b/php.ini
new file mode 100644
index 00000000..837be2ab
--- /dev/null
+++ b/php.ini
@@ -0,0 +1,3 @@
+always_populate_raw_post_data=-1
+geoip.custom_directory=/var/www/html/misc
+display_errors=Off
diff --git a/update.sh b/update.sh
index 73888534..e4602692 100755
--- a/update.sh
+++ b/update.sh
@@ -18,6 +18,8 @@ set -x
 
 for variant in apache fpm; do
 	cp Dockerfile.template "$variant/Dockerfile"
+	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
+	cp php.ini "$variant/php.ini"
 	sed -ri -e '
 		s/%%VARIANT%%/'"$variant"'/;
 		s/%%VERSION%%/'"$latest"'/;