diff --git a/bitnami/rabbitmq/3.9/debian-11/Dockerfile b/bitnami/rabbitmq/3.9/debian-11/Dockerfile
index b73d4e5f8f7e..3e844c3ac991 100644
--- a/bitnami/rabbitmq/3.9/debian-11/Dockerfile
+++ b/bitnami/rabbitmq/3.9/debian-11/Dockerfile
@@ -7,7 +7,7 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="3.9.22-debian-11-r7" \
+      org.opencontainers.image.ref.name="3.9.22-debian-11-r8" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq" \
       org.opencontainers.image.title="rabbitmq" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
index 5fa07892f893..0255686f9603 100644
--- a/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
+++ b/bitnami/rabbitmq/3.9/debian-11/rootfs/opt/bitnami/scripts/rabbitmq-env.sh
@@ -130,6 +130,7 @@ export RABBITMQ_NODE_PORT_NUMBER="${RABBITMQ_NODE_PORT_NUMBER:-5672}"
 export RABBITMQ_NODE_TYPE="${RABBITMQ_NODE_TYPE:-stats}"
 RABBITMQ_VHOST="${RABBITMQ_VHOST:-"${RABBITMQ_DEFAULT_VHOST:-}"}"
 export RABBITMQ_VHOST="${RABBITMQ_VHOST:-/}"
+export RABBITMQ_VHOSTS="${RABBITMQ_VHOSTS:-}"
 export RABBITMQ_CLUSTER_REBALANCE="${RABBITMQ_CLUSTER_REBALANCE:-false}"
 export RABBITMQ_CLUSTER_REBALANCE_ATTEMPTS="${RABBITMQ_CLUSTER_REBALANCE_ATTEMPTS:-100}"
 
@@ -139,9 +140,6 @@ export RABBITMQ_USERNAME="${RABBITMQ_USERNAME:-user}"
 RABBITMQ_PASSWORD="${RABBITMQ_PASSWORD:-"${RABBITMQ_DEFAULT_PASS:-}"}"
 export RABBITMQ_PASSWORD="${RABBITMQ_PASSWORD:-bitnami}"
 
-# RabbitMQ vhosts
-export RABBITMQ_VHOSTS="${RABBITMQ_VHOSTS:-}"
-
 # Force boot cluster
 export RABBITMQ_FORCE_BOOT="${RABBITMQ_FORCE_BOOT:-no}"
 
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 55625d3dd15e..4eda8689762a 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`3.10`, `3.10-debian-11`, `3.10.7`, `3.10.7-debian-11-r8`, `latest` (3.10/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/rabbitmq/3.10/debian-11/Dockerfile)
-* [`3.9`, `3.9-debian-11`, `3.9.22`, `3.9.22-debian-11-r7` (3.9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/rabbitmq/3.9/debian-11/Dockerfile)
+* [`3.9`, `3.9-debian-11`, `3.9.22`, `3.9.22-debian-11-r8` (3.9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/rabbitmq/3.9/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).