diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/Dockerfile
index 879253807989..94c3fbec86b3 100644
--- a/bitnami/nginx/Dockerfile
+++ b/bitnami/nginx/Dockerfile
@@ -3,18 +3,17 @@ MAINTAINER Bitnami
 
 ENV BITNAMI_PREFIX=/usr/local/bitnami
 ENV BITNAMI_APP_NAME nginxstandalonestack
-ENV BITNAMI_APP_DIRNAME nginx
 ENV BITNAMI_APP_VERSION 1.8.0-0
-ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_DIRNAME
+ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/nginx
 
 ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh
 ADD post-install.sh /tmp/post-install.sh
 
 RUN sh /tmp/install.sh
 
-ADD vhosts/* /usr/local/bitnami/nginx/conf.defaults/vhosts/
+ADD vhosts/* $BITNAMI_APP_DIR/conf.defaults/vhosts/
 
-ENV PATH /usr/local/bitnami/nginx/sbin:/usr/local/bitnami/common/bin:$PATH
+ENV PATH $BITNAMI_APP_DIR/sbin:$BITNAMI_PREFIX/common/bin:$PATH
 
 EXPOSE 80 443
 VOLUME ["/logs", "/conf", "/app"]
diff --git a/bitnami/nginx/entrypoint.sh b/bitnami/nginx/entrypoint.sh
index 98fb66f82549..867db2404792 100755
--- a/bitnami/nginx/entrypoint.sh
+++ b/bitnami/nginx/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -e
 SERVICE_USER=daemon
 
 if [ ! "$(ls -A /conf)" ]; then