diff --git a/bitnami/redis/Dockerfile b/bitnami/redis/Dockerfile
index ad4b5ef80c00..9b2a2aa2283d 100644
--- a/bitnami/redis/Dockerfile
+++ b/bitnami/redis/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=redis \
     BITNAMI_APP_USER=redis \
+    BITNAMI_APP_DAEMON=redis-server \
     BITNAMI_APP_VERSION=3.0.4-0
 
 ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME \
diff --git a/bitnami/redis/rootfs/entrypoint.sh b/bitnami/redis/rootfs/entrypoint.sh
deleted file mode 100755
index 041dcb3a733d..000000000000
--- a/bitnami/redis/rootfs/entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ "${1:0:1}" = '-' ]; then
-  export EXTRA_OPTIONS="$@"
-  set --
-elif [ "${1}" == "redis-server" -o "${1}" == "$(which redis-server)" ]; then
-  export EXTRA_OPTIONS="${@:2}"
-  set --
-fi
-
-if [ -n "${1}" ]; then
-  touch /etc/services.d/$BITNAMI_APP_NAME/down
-  touch /etc/services.d/$BITNAMI_APP_NAME-logs/down
-fi
-
-exec /init "$@"
diff --git a/bitnami/redis/rootfs/etc/services.d/redis/run b/bitnami/redis/rootfs/etc/services.d/redis/run
index ad40835d7a36..dc0fbc1a9776 100755
--- a/bitnami/redis/rootfs/etc/services.d/redis/run
+++ b/bitnami/redis/rootfs/etc/services.d/redis/run
@@ -4,4 +4,4 @@ source $BITNAMI_PREFIX/bitnami-utils.sh
 
 mkdir -p $BITNAMI_APP_DIR/tmp
 date '+%d%H%M%S' > $BITNAMI_APP_DIR/tmp/start
-exec s6-setuidgid $BITNAMI_APP_USER redis-server $BITNAMI_APP_VOL_PREFIX/conf/redis.conf $PROGRAM_OPTIONS ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}
+exec s6-setuidgid $BITNAMI_APP_USER $BITNAMI_APP_DAEMON $BITNAMI_APP_VOL_PREFIX/conf/redis.conf $PROGRAM_OPTIONS ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}