diff --git a/bitnami/rabbitmq/3.7/Dockerfile b/bitnami/rabbitmq/3.7/Dockerfile
index 87ea1d5e0b2c..c5ccc134e320 100644
--- a/bitnami/rabbitmq/3.7/Dockerfile
+++ b/bitnami/rabbitmq/3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:jessie-r24
+FROM bitnami/minideb-extras:jessie-r28
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -7,9 +7,8 @@ RUN bitnami-pkg install erlang-20.3.0-0 --checksum d2e6ccd154960eb289c1bde6b40a5
 RUN bitnami-pkg unpack rabbitmq-3.7.4-2 --checksum c816bd75165948297f048ff3ce7016f1e85f44bf60c493f6e20682b37a2c0e82
 
 COPY rootfs /
-
 ENV BITNAMI_APP_NAME="rabbitmq" \
-    BITNAMI_IMAGE_VERSION="3.7.4-r3" \
+    BITNAMI_IMAGE_VERSION="3.7.4-r4" \
     PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/bin:/opt/bitnami/rabbitmq/sbin:$PATH" \
     RABBITMQ_CLUSTER_NODE_NAME="" \
     RABBITMQ_CLUSTER_PARTITION_HANDLING="ignore" \
diff --git a/bitnami/rabbitmq/3.7/rootfs/app-entrypoint.sh b/bitnami/rabbitmq/3.7/rootfs/app-entrypoint.sh
index d3c32f034148..78485f2525fa 100755
--- a/bitnami/rabbitmq/3.7/rootfs/app-entrypoint.sh
+++ b/bitnami/rabbitmq/3.7/rootfs/app-entrypoint.sh
@@ -7,7 +7,6 @@ print_welcome_page
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
   . /init.sh
-
   nami_initialize rabbitmq
   info "Starting rabbitmq... "
 fi
diff --git a/bitnami/rabbitmq/3.7/rootfs/init.sh b/bitnami/rabbitmq/3.7/rootfs/init.sh
index b92e84b4864d..3206f7dc24fa 100644
--- a/bitnami/rabbitmq/3.7/rootfs/init.sh
+++ b/bitnami/rabbitmq/3.7/rootfs/init.sh
@@ -1,5 +1,5 @@
-# set defaults
+# Set defaults
 export RABBITMQ_ULIMIT_NOFILES=${RABBITMQ_ULIMIT_NOFILES:-65536}
 
-# apply resources limits
+# Apply resources limits
 ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
diff --git a/bitnami/rabbitmq/circle.yml b/bitnami/rabbitmq/circle.yml
index bb28976aa695..8e30f74d98f9 100644
--- a/bitnami/rabbitmq/circle.yml
+++ b/bitnami/rabbitmq/circle.yml
@@ -8,11 +8,12 @@ jobs:
           RELEASE_SERIES_LIST: "3.7,3.6"
           LATEST_STABLE: "3.7"
           IMAGE_NAME: rabbitmq
-          CHART_REPO: https://github.com/bitnami/charts
-          EXTRA_CHART_REPOS_LIST: "https://github.com/kubernetes/charts"
+          CHART_NAME:
+          CHART_REPO:
           DOCKER_PROJECT: bitnami
           QUAY_PROJECT: bitnami
           GCLOUD_PROJECT: bitnami-containers
+          AZURE_PROJECT: bitnami
 
     steps:
       - checkout