diff --git a/bitnami/rabbitmq/Dockerfile b/bitnami/rabbitmq/Dockerfile
index e98c867eeb24..8339261467fc 100644
--- a/bitnami/rabbitmq/Dockerfile
+++ b/bitnami/rabbitmq/Dockerfile
@@ -3,7 +3,7 @@ FROM gcr.io/stacksmith-images/minideb:jessie-r2
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=rabbitmq \
-    BITNAMI_IMAGE_VERSION=3.6.6-r0 \
+    BITNAMI_IMAGE_VERSION=3.6.6-r1 \
     PATH=/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/bin:$PATH
 
 # Additional modules required
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index f6a7d7e6b93d..4fb98fc72881 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -141,8 +141,8 @@ Available variables:
  - `RABBITMQ_PASSWORD`: RabbitMQ application password. Default: **bitnami**
  - `RABBITMQ_VHOST`: RabbitMQ application vhost. Default: **/**
  - `RABBITMQ_ERLANG_COOKIE`: Erlang cookie to determine whether different nodes are allowed to communicate with each other.
- - `RABBITMQ_NODE_TYPE`: Node Type. Valid values: *stats*, **queue-ram* or *queue-disc*. Default: **stats**
- - `RABBITMQ_NODE_NAME`: Node name. E.g.: *node@hostname* or *node* (If you don't specify the hostname, the env variables will be used.). Default **rabbit**
+ - `RABBITMQ_NODE_TYPE`: Node Type. Valid values: *stats*, *queue-ram* or *queue-disc*. Default: **stats**
+ - `RABBITMQ_NODE_NAME`: Node name and host. E.g.: *node@hostname* or *node* (localhost won't work in cluster topology). Default **rabbit@localhost**
  - `RABBITMQ_NODE_PORT`: Node port. Default: **5672**
  - `RABBITMQ_CLUSTER_NODE_NAME`: Node name to cluster with. E.g.: **clusternode@hostname**
  - `RABBITMQ_MANAGER_PORT`: Manager port. Default: **15672**
diff --git a/bitnami/rabbitmq/rootfs/app-entrypoint.sh b/bitnami/rabbitmq/rootfs/app-entrypoint.sh
index 71f70a6f2d4e..c6eda825dd7b 100755
--- a/bitnami/rabbitmq/rootfs/app-entrypoint.sh
+++ b/bitnami/rabbitmq/rootfs/app-entrypoint.sh
@@ -20,7 +20,7 @@ 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"}
+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