diff --git a/3.7-rc/alpine/docker-entrypoint.sh b/3.7-rc/alpine/docker-entrypoint.sh
index 32b765c3..1af7a232 100755
--- a/3.7-rc/alpine/docker-entrypoint.sh
+++ b/3.7-rc/alpine/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/3.7-rc/ubuntu/docker-entrypoint.sh b/3.7-rc/ubuntu/docker-entrypoint.sh
index 4b002977..51e25138 100755
--- a/3.7-rc/ubuntu/docker-entrypoint.sh
+++ b/3.7-rc/ubuntu/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh
index 32b765c3..1af7a232 100755
--- a/3.7/alpine/docker-entrypoint.sh
+++ b/3.7/alpine/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/3.7/ubuntu/docker-entrypoint.sh b/3.7/ubuntu/docker-entrypoint.sh
index 4b002977..51e25138 100755
--- a/3.7/ubuntu/docker-entrypoint.sh
+++ b/3.7/ubuntu/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh
index 32b765c3..1af7a232 100755
--- a/3.8-rc/alpine/docker-entrypoint.sh
+++ b/3.8-rc/alpine/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/3.8-rc/ubuntu/docker-entrypoint.sh b/3.8-rc/ubuntu/docker-entrypoint.sh
index 4b002977..51e25138 100755
--- a/3.8-rc/ubuntu/docker-entrypoint.sh
+++ b/3.8-rc/ubuntu/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4b002977..51e25138 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -260,7 +260,7 @@ rabbit_env_config() {
 		local key="$conf"
 		case "$prefix" in
 			ssl) key="ssl_options.$key" ;;
-			management_ssl) key="management.listener.ssl_opts.$key" ;;
+			management_ssl) key="management.ssl.$key" ;;
 		esac
 
 		local val="${!var:-}"
@@ -366,12 +366,10 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
 	# https://www.rabbitmq.com/management.html#configuration
 	if [ "$(rabbitmq-plugins list -q -m -e rabbitmq_management)" ]; then
 		if [ "$haveManagementSslConfig" ]; then
-			rabbit_set_config 'management.listener.port' 15671
-			rabbit_set_config 'management.listener.ssl' 'true'
+			rabbit_set_config 'management.ssl.port' 15671
 			rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}"
 		else
-			rabbit_set_config 'management.listener.port' 15672
-			rabbit_set_config 'management.listener.ssl' 'false'
+			rabbit_set_config 'management.tcp.port' 15672
 		fi
 
 		# if definitions file exists, then load it