diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/alpine-3/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/debian-8/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/debian-9/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
+++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
index 36a49dcc9..da044f469 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
@@ -1,28 +1,38 @@
 PHP development environment variables
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-====================================== ===================================== ==============================================
-Environment variable                    Description                          Default
-====================================== ===================================== ==============================================
-``WEB_DOCUMENT_ROOT``                  Document root for webserver           ``/app``
-``WEB_DOCUMENT_INDEX``                 Index document                        ``index.php``
-``WEB_ALIAS_DOMAIN``                   Domain aliases                        ``*.vm``
-``WEB_PHP_SOCKET``                     PHP-FPM socket address                ``127.0.0.1:9000`` (for php-* images)
-``WEB_NO_CACHE_PATTERN``               RegExp of files which should          ``\.(css|js|gif|png|jpg|svg|json|xml)$``
-                                       be delivered by webserver as
-                                       non cacheable to browser
-``PHP_DEBUGGER``                       Specifies which php debugger          *empty* (eg. ``xdebug``, ``blackfire`` or
-                                       should be active                      ``none``)
-``XDEBUG_REMOTE_AUTOSTART``            php.ini value for                     ``none``
-                                       ``xdebug.remote_autostart``
-``XDEBUG_REMOTE_CONNECT_BACK``         php.ini value for                     ``none``
-                                       ``xdebug.remote_connect_back``
-``XDEBUG_REMOTE_HOST``                 php.ini value for                     ``none``
-                                       ``xdebug.remote_host``
-``XDEBUG_REMOTE_PORT``                 php.ini value for                     ``none``
-                                       ``xdebug.remote_port``
-``BLACKFIRE_SERVER_ID``                php.ini value for                     ``none``
-                                       ``blackfire.server_id``
-``BLACKFIRE_SERVER_TOKEN``             php.ini value for                     ``none``
-                                       ``blackfire.server_token``
-====================================== ===================================== ==============================================
+============================================= ========================================= ==============================================
+Environment variable                          Description                               Default
+============================================= ========================================= ==============================================
+``WEB_DOCUMENT_ROOT``                         Document root for webserver               ``/app``
+``WEB_DOCUMENT_INDEX``                        Index document                            ``index.php``
+``WEB_ALIAS_DOMAIN``                          Domain aliases                            ``*.vm``
+``WEB_PHP_SOCKET``                            PHP-FPM socket address                    ``127.0.0.1:9000`` (for php-* images)
+``WEB_NO_CACHE_PATTERN``                      RegExp of files which should              ``\.(css|js|gif|png|jpg|svg|json|xml)$``
+                                              be delivered by webserver as
+                                              non cacheable to browser
+``PHP_DEBUGGER``                              Specifies which php debugger              *empty* (eg. ``xdebug``, ``blackfire`` or
+                                              should be active                          ``none``)
+``XDEBUG_REMOTE_AUTOSTART``                   php.ini value for                         ``none``
+                                              ``xdebug.remote_autostart``
+``XDEBUG_REMOTE_CONNECT_BACK``                php.ini value for                         ``none``
+                                              ``xdebug.remote_connect_back``
+``XDEBUG_REMOTE_HOST``                        php.ini value for                         ``none``
+                                              ``xdebug.remote_host``
+``XDEBUG_REMOTE_PORT``                        php.ini value for                         ``none``
+                                              ``xdebug.remote_port``
+``XDEBUG_PROFILER_ENABLE``                    php.ini value for                         ``none``
+                                              ``xdebug.profiler_enable``
+``XDEBUG_PROFILER_ENABLE_TRIGGER``            php.ini value for                         ``none``
+                                              ``xdebug.profiler_enable_trigger``
+``XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE``      php.ini value for                         ``none``
+                                              ``xdebug.profiler_enable_trigger_value``
+``XDEBUG_PROFILER_OUTPUT_DIR``                php.ini value for                         ``none``
+                                              ``xdebug.profiler_output_dir``
+``XDEBUG_PROFILER_OUTPUT_NAME``               php.ini value for                         ``none``
+                                              ``xdebug.profiler_output_name``
+``BLACKFIRE_SERVER_ID``                       php.ini value for                         ``none``
+                                              ``blackfire.server_id``
+``BLACKFIRE_SERVER_TOKEN``                    php.ini value for                         ``none``
+                                              ``blackfire.server_token``
+============================================= ========================================= ==============================================
diff --git a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh
index fc52a673f..7156e28aa 100644
--- a/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh
+++ b/provisioning/php-dev/general/provision/entrypoint.d/10-php-debugger.sh
@@ -62,46 +62,34 @@ fi
 #################################################
 
 function phpEnvironmentVariable() {
-    PHP_ENV_NAME="$1"
-    PHP_ENV_VALUE="$2"
+    PHP_INI_KEY="$1"
+    PHP_ENV_NAME="$2"
 
-    echo "${PHP_ENV_NAME}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    if [[ -n "${!PHP_ENV_NAME+x}" ]]; then
+        PHP_ENV_VALUE="${!PHP_ENV_NAME}"
+        echo "${PHP_INI_KEY}=\"${PHP_ENV_VALUE}\"" >> /opt/docker/etc/php/php.ini
+    fi
 }
 
 ###################
 # XDEBUG
 ###################
 
-# xdebug.remote_connect_back
-if [[ -n "${XDEBUG_REMOTE_CONNECT_BACK+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_connect_back" "$XDEBUG_REMOTE_CONNECT_BACK"
-fi
-
-# xdebug.remote_autostart
-if [[ -n "${XDEBUG_REMOTE_AUTOSTART+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_autostart" "$XDEBUG_REMOTE_AUTOSTART"
-fi
+# remote debugger
+phpEnvironmentVariable "xdebug.remote_connect_back" "XDEBUG_REMOTE_CONNECT_BACK"
+phpEnvironmentVariable "xdebug.remote_autostart"    "XDEBUG_REMOTE_AUTOSTART"
+phpEnvironmentVariable "xdebug.remote_host"         "XDEBUG_REMOTE_HOST"
+phpEnvironmentVariable "xdebug.remote_port"         "XDEBUG_REMOTE_PORT"
 
-# xdebug.remote_host
-if [[ -n "${XDEBUG_REMOTE_HOST+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_host" "$XDEBUG_REMOTE_HOST"
-fi
-
-# xdebug.remote_port
-if [[ -n "${XDEBUG_REMOTE_PORT+x}" ]]; then
-    phpEnvironmentVariable "xdebug.remote_port" "$XDEBUG_REMOTE_PORT"
-fi
+# profiler
+phpEnvironmentVariable "xdebug.profiler_enable"               "XDEBUG_PROFILER_ENABLE"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger"       "XDEBUG_PROFILER_ENABLE_TRIGGER"
+phpEnvironmentVariable "xdebug.profiler_enable_trigger_value" "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE"
+phpEnvironmentVariable "xdebug.profiler_output_dir"           "XDEBUG_PROFILER_OUTPUT_DIR"
+phpEnvironmentVariable "xdebug.profiler_output_name"          "XDEBUG_PROFILER_OUTPUT_NAME"
 
 ###################
 # BLACKFIRE
 ###################
-
-# blackfire.server_id
-if [[ -n "${BLACKFIRE_SERVER_ID+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_id" "$BLACKFIRE_SERVER_ID"
-fi
-
-# blackfire.server_token
-if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
-    phpEnvironmentVariable "blackfire.server_token" "$BLACKFIRE_SERVER_TOKEN"
-fi
+phpEnvironmentVariable "blackfire.server_id"    "BLACKFIRE_SERVER_ID"
+phpEnvironmentVariable "blackfire.server_token" "BLACKFIRE_SERVER_TOKEN"