diff --git a/bitnami/rabbitmq/Dockerfile b/bitnami/rabbitmq/Dockerfile
index 207fd2e8021c..5af4b8599d22 100644
--- a/bitnami/rabbitmq/Dockerfile
+++ b/bitnami/rabbitmq/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/minideb:jessie-r8
+FROM gcr.io/stacksmith-images/minideb:jessie-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
@@ -17,8 +17,15 @@ RUN bitnami-pkg unpack rabbitmq-3.6.6-2 --checksum a45b57ff8ba832ef005721f120270
 
 COPY rootfs /
 
-VOLUME ["/bitnami/rabbitmq"]
+ENV RABBITMQ_VHOST="/" \
+    RABBITMQ_USERNAME="user" \
+    RABBITMQ_PASSWORD="bitnami" \
+    RABBITMQ_NODE_TYPE="stats" \
+    RABBITMQ_NODE_PORT="5672" \
+    RABBITMQ_NODE_NAME="rabbit@localhost" \
+    RABBITMQ_MANAGER_PORT="15672"
 
+VOLUME ["/bitnami/rabbitmq"]
 
 EXPOSE 4369 5672 25672 15672
 
diff --git a/bitnami/rabbitmq/rootfs/app-entrypoint.sh b/bitnami/rabbitmq/rootfs/app-entrypoint.sh
index c6eda825dd7b..db1b47f9a535 100755
--- a/bitnami/rabbitmq/rootfs/app-entrypoint.sh
+++ b/bitnami/rabbitmq/rootfs/app-entrypoint.sh
@@ -1,31 +1,13 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
 
-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
-}
+print_welcome_page
+check_for_updates &
 
-# Set default values
-export RABBITMQ_VHOST=${RABBITMQ_VHOST:-"/"}
-export RABBITMQ_USERNAME=${RABBITMQ_USERNAME:-"user"}
-export RABBITMQ_PASSWORD=${RABBITMQ_PASSWORD:-"bitnami"}
-export RABBITMQ_NODE_TYPE=${RABBITMQ_NODE_TYPE:-"stats"}
-export RABBITMQ_NODE_PORT=${RABBITMQ_NODE_PORT:-"5672"}
-export RABBITMQ_NODE_NAME=${RABBITMQ_NODE_NAME:-"rabbit@localhost"}
-export RABBITMQ_MANAGER_PORT=${RABBITMQ_MANAGER_PORT:-"15672"}
-
-if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-   initialize rabbitmq
-   echo "Starting application ..."
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize rabbitmq
+  info "Starting rabbitmq..."
 fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"