diff --git a/bin/configure b/bin/configure
index ff1e414415..d325fcd6b4 100755
--- a/bin/configure
+++ b/bin/configure
@@ -137,6 +137,15 @@ fi
 # --------------------------------------------------------------------------
 
 
+# -------------------------------- PHP -------------------------------------
+if echo "${DOCKER}" | grep -Fq '"php"'; then
+    ${WHIPTAIL} --title "Build PHP container locally?" --clear --backtitle 'GNU social' \
+                --yesno "\nDo you want to use a compile the needed PHP extensions and build the container locally? (may provide better performance, needs more than 1GiB of RAM)" 0 0 \
+                3>&1 1>&2 2>&3
+    BUILD_PHP=$((1-$?)) # Invert output
+fi
+# --------------------------------------------------------------------------
+
 
 # ------------------------ Network configuration ----------------------------
 while true; do
@@ -386,6 +395,7 @@ export NGINX_HTTP_PORT="${NGINX_HTTP_PORT}"
 export NGINX_HTTPS_PORT="${NGINX_HTTPS_PORT}"
 export PHP_PORT="${PHP_PORT}"
 export DBMS="${DBMS}"
+export BUILD_PHP="${BUILD_PHP}"
 
 for SERV in ${DOCKER}; do
     SERV=$(echo "${SERV}" | sed -r 's/"([^"]*)"/\1/')
diff --git a/docker/php/docker-compose.fragment.sh b/docker/php/docker-compose.fragment.sh
index c4e162c9c5..81e6ea60da 100644
--- a/docker/php/docker-compose.fragment.sh
+++ b/docker/php/docker-compose.fragment.sh
@@ -1,10 +1,16 @@
 #!/usr/bin/sh
 
-cat <<EOF
+if [ $LE_CERT -ne 0 ]; then
+    cat <<EOF
     php:
         build: docker/php
 EOF
-
+else
+    cat <<EOF
+    php:
+        image: gsocial/php
+EOF
+fi
 
 # If the user wants a DB docker container
 if echo "${DOCKER}" | grep -Fvq '"db"'; then