diff --git a/bitnami/php-fpm/Dockerfile b/bitnami/php-fpm/Dockerfile
index 48fd2f035ff8..208d0e439e86 100644
--- a/bitnami/php-fpm/Dockerfile
+++ b/bitnami/php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/ubuntu:14.04-r8
+FROM gcr.io/stacksmith-images/ubuntu:14.04-r9
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_IMAGE_VERSION=7.0.6-r1 \
@@ -11,7 +11,7 @@ ENV PATH=/opt/bitnami/php/sbin:/opt/bitnami/php/bin:/opt/bitnami/common/bin:$PAT
 
 COPY rootfs/ /
 ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["harpoon", "start", "--foreground", "php"]
+CMD ["nami", "start", "--foreground", "php"]
 
 VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
 
diff --git a/bitnami/php-fpm/rootfs/app-entrypoint.sh b/bitnami/php-fpm/rootfs/app-entrypoint.sh
index c55baabc4624..9306ae55f50c 100755
--- a/bitnami/php-fpm/rootfs/app-entrypoint.sh
+++ b/bitnami/php-fpm/rootfs/app-entrypoint.sh
@@ -5,10 +5,10 @@ if [ -f composer.json  ]; then
   composer install
 fi
 
-if [[ "$1" == "harpoon" && "$2" == "start" ]]; then
-  status=`harpoon inspect php`
+if [[ "$1" == "nami" && "$2" == "start" ]]; then
+  status=`nami inspect php`
   if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
-    harpoon initialize php
+    nami initialize php
   fi
   chown -R :$BITNAMI_APP_USER /bitnami/$BITNAMI_APP_NAME || true
 fi