diff --git a/bitnami/rabbitmq/3.7/ol-7/Dockerfile b/bitnami/rabbitmq/3.7/ol-7/Dockerfile
new file mode 100644
index 000000000000..2636bbea5812
--- /dev/null
+++ b/bitnami/rabbitmq/3.7/ol-7/Dockerfile
@@ -0,0 +1,28 @@
+FROM bitnami/oraclelinux-extras:7-r13
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+# Install required system packages and dependencies
+RUN install_packages glibc ncurses-libs openssl-libs zlib
+RUN bitnami-pkg install erlang-20.3.0-0 --checksum c38b4ba132784a8a9d180b7a1c94b99e2713dd32e425c3b1276ef45486dcb520
+RUN bitnami-pkg unpack rabbitmq-3.7.6-0 --checksum 98c570f134c01be803608c9fa8ed5c17fb61cc530e9bf057a853294a8373510a
+
+COPY rootfs /
+ENV BITNAMI_APP_NAME="rabbitmq" \
+    BITNAMI_IMAGE_VERSION="3.7.6-ol-7-r0" \
+    PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/bin:/opt/bitnami/rabbitmq/sbin:$PATH" \
+    RABBITMQ_CLUSTER_NODE_NAME="" \
+    RABBITMQ_CLUSTER_PARTITION_HANDLING="ignore" \
+    RABBITMQ_DISK_FREE_LIMIT="{mem_relative, 1.0}" \
+    RABBITMQ_ERL_COOKIE="" \
+    RABBITMQ_MANAGER_PORT_NUMBER="15672" \
+    RABBITMQ_NODE_NAME="rabbit@localhost" \
+    RABBITMQ_NODE_PORT_NUMBER="5672" \
+    RABBITMQ_NODE_TYPE="stats" \
+    RABBITMQ_PASSWORD="bitnami" \
+    RABBITMQ_USERNAME="user" \
+    RABBITMQ_VHOST="/"
+
+EXPOSE 4369 5672 25672 15672
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["nami","start","--foreground","rabbitmq"]
diff --git a/bitnami/rabbitmq/3.7/ol-7/docker-compose.yml b/bitnami/rabbitmq/3.7/ol-7/docker-compose.yml
new file mode 100644
index 000000000000..30d1535a5cff
--- /dev/null
+++ b/bitnami/rabbitmq/3.7/ol-7/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '2'
+
+services:
+  rabbitmq:
+    image: 'bitnami/rabbitmq:3.7-ol-7'
+    ports:
+      - '4369:4369'
+      - '5672:5672'
+      - '25672:25672'
+      - '15672:15672'
+    volumes:
+      - 'rabbitmq_data:/bitnami'
+volumes:
+  rabbitmq_data:
+    driver: local
diff --git a/bitnami/rabbitmq/3.7/ol-7/rootfs/app-entrypoint.sh b/bitnami/rabbitmq/3.7/ol-7/rootfs/app-entrypoint.sh
new file mode 100755
index 000000000000..78485f2525fa
--- /dev/null
+++ b/bitnami/rabbitmq/3.7/ol-7/rootfs/app-entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  . /init.sh
+  nami_initialize rabbitmq
+  info "Starting rabbitmq... "
+fi
+
+exec tini -- "$@"
diff --git a/bitnami/rabbitmq/3.7/ol-7/rootfs/init.sh b/bitnami/rabbitmq/3.7/ol-7/rootfs/init.sh
new file mode 100644
index 000000000000..3206f7dc24fa
--- /dev/null
+++ b/bitnami/rabbitmq/3.7/ol-7/rootfs/init.sh
@@ -0,0 +1,5 @@
+# Set defaults
+export RABBITMQ_ULIMIT_NOFILES=${RABBITMQ_ULIMIT_NOFILES:-65536}
+
+# Apply resources limits
+ulimit -n "${RABBITMQ_ULIMIT_NOFILES}"
diff --git a/bitnami/rabbitmq/3.7/ol-7/rootfs/rabbitmq-inputs.json b/bitnami/rabbitmq/3.7/ol-7/rootfs/rabbitmq-inputs.json
new file mode 100644
index 000000000000..fa6282c8349e
--- /dev/null
+++ b/bitnami/rabbitmq/3.7/ol-7/rootfs/rabbitmq-inputs.json
@@ -0,0 +1,13 @@
+{
+  "clusterNodeName": "{{$global.env.RABBITMQ_CLUSTER_NODE_NAME}}",
+  "clusterPartitionHandling": "{{$global.env.RABBITMQ_CLUSTER_PARTITION_HANDLING}}",
+  "diskFreeLimit": "{{$global.env.RABBITMQ_DISK_FREE_LIMIT}}",
+  "erlangCookie": "{{$global.env.RABBITMQ_ERL_COOKIE}}",
+  "managerPort": "{{$global.env.RABBITMQ_MANAGER_PORT_NUMBER}}",
+  "nodeName": "{{$global.env.RABBITMQ_NODE_NAME}}",
+  "nodePort": "{{$global.env.RABBITMQ_NODE_PORT_NUMBER}}",
+  "nodeType": "{{$global.env.RABBITMQ_NODE_TYPE}}",
+  "password": "{{$global.env.RABBITMQ_PASSWORD}}",
+  "username": "{{$global.env.RABBITMQ_USERNAME}}",
+  "vhost": "{{$global.env.RABBITMQ_VHOST}}"
+}
\ No newline at end of file
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 676546af7c73..b3212e587e0c 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -32,7 +32,7 @@ $ docker-compose up -d
 
 # Supported tags and respective `Dockerfile` links
 
-* [`3.7`, `3.7.6-r9`, `latest` (3.7/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.7.6-r9/3.7/Dockerfile)
+* [`3.7`, `3.7.6-r0`, `latest` (3.7/Dockerfile)](https://github.com/bitnami/bitnami-docker-rabbitmq/blob/3.7.6-r0/3.7/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/rabbitmq GitHub repo](https://github.com/bitnami/bitnami-docker-rabbitmq).