diff --git a/bitnami/redis/Dockerfile b/bitnami/redis/Dockerfile
index 85fc47d42362..47e2d91af39d 100644
--- a/bitnami/redis/Dockerfile
+++ b/bitnami/redis/Dockerfile
@@ -2,20 +2,27 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r9
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_IMAGE_VERSION=3.2.8-r0 \
-    BITNAMI_APP_NAME=redis \
-    BITNAMI_APP_USER=redis
+    BITNAMI_APP_NAME=redis
 
 # System packages required
 RUN install_packages libc6
 
 # Install redis
 RUN bitnami-pkg unpack redis-3.2.8-0 --checksum 2dcd69c0bbcb6e2ab82975d39ee32c2795c612e85012d599d36553c4f5ab8f3d
-ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
+ENV PATH=/opt/bitnami/redis/sbin:/opt/bitnami/redis/bin:$PATH
 
 COPY rootfs /
+
+ENV REDIS_PASSWORD= \
+    REDIS_REPLICATION_MODE= \
+    REDIS_MASTER_HOST= \
+    REDIS_MASTER_PORT=6379 \
+    REDIS_MASTER_PASSWORD=
+
 ENTRYPOINT ["/app-entrypoint.sh"]
+
 CMD ["nami", "start", "--foreground", "redis"]
 
-VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
+VOLUME ["/bitnami/redis"]
 
 EXPOSE 6379
diff --git a/bitnami/redis/rootfs/app-entrypoint.sh b/bitnami/redis/rootfs/app-entrypoint.sh
index 4efebd232f83..e3a181aeba1e 100755
--- a/bitnami/redis/rootfs/app-entrypoint.sh
+++ b/bitnami/redis/rootfs/app-entrypoint.sh
@@ -13,13 +13,6 @@ function initialize {
     fi
 }
 
-# Set default values
-export REDIS_PASSWORD=${REDIS_PASSWORD:-}
-export REDIS_REPLICATION_MODE=${REDIS_REPLICATION_MODE:-}
-export REDIS_MASTER_HOST=${REDIS_MASTER_HOST:-}
-export REDIS_MASTER_PORT=${REDIS_MASTER_PORT:-6379}
-export REDIS_MASTER_PASSWORD=${REDIS_MASTER_PASSWORD:-}
-
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
     initialize redis
     echo "Starting application ..."