diff --git a/bitnami/php-fpm/rootfs/app-entrypoint.sh b/bitnami/php-fpm/rootfs/app-entrypoint.sh
index 9306ae55f50c..303b2ef04d63 100755
--- a/bitnami/php-fpm/rootfs/app-entrypoint.sh
+++ b/bitnami/php-fpm/rootfs/app-entrypoint.sh
@@ -1,16 +1,26 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
+
+function initialize {
+    # Package can be "installed" or "unpacked"
+    status=`nami inspect $1`
+    if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
+        # Clean up inputs
+        inputs=""
+        if [[ -f /$1-inputs.json ]]; then
+            inputs=--inputs-file=/$1-inputs.json
+        fi
+        nami initialize $1 $inputs
+    fi
+}
 
 if [ -f composer.json  ]; then
   composer install
 fi
 
-if [[ "$1" == "nami" && "$2" == "start" ]]; then
-  status=`nami inspect php`
-  if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
-    nami initialize php
-  fi
-  chown -R :$BITNAMI_APP_USER /bitnami/$BITNAMI_APP_NAME || true
+if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
+    initialize php
+    chown -R :$BITNAMI_APP_USER /bitnami/php || true
+    echo "Starting application ..."
 fi
 
 exec /entrypoint.sh "$@"
diff --git a/bitnami/php-fpm/rootfs/php-inputs.json b/bitnami/php-fpm/rootfs/php-inputs.json
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/bitnami/php-fpm/rootfs/php-inputs.json
@@ -0,0 +1,2 @@
+{
+}