diff --git a/3.6/alpine/docker-entrypoint.sh b/3.6/alpine/docker-entrypoint.sh
index d73505de..ed127636 100755
--- a/3.6/alpine/docker-entrypoint.sh
+++ b/3.6/alpine/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.6/debian/docker-entrypoint.sh b/3.6/debian/docker-entrypoint.sh
index 3f78ac07..5fe4cf31 100755
--- a/3.6/debian/docker-entrypoint.sh
+++ b/3.6/debian/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.6/docker-entrypoint.sh b/3.6/docker-entrypoint.sh
index 3f78ac07..5fe4cf31 100755
--- a/3.6/docker-entrypoint.sh
+++ b/3.6/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7-rc/alpine/docker-entrypoint.sh b/3.7-rc/alpine/docker-entrypoint.sh
index cd806cbf..9fe74a63 100755
--- a/3.7-rc/alpine/docker-entrypoint.sh
+++ b/3.7-rc/alpine/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7-rc/debian/docker-entrypoint.sh b/3.7-rc/debian/docker-entrypoint.sh
index 99ae42be..dcf8fb88 100755
--- a/3.7-rc/debian/docker-entrypoint.sh
+++ b/3.7-rc/debian/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7-rc/docker-entrypoint.sh b/3.7-rc/docker-entrypoint.sh
index 99ae42be..dcf8fb88 100755
--- a/3.7-rc/docker-entrypoint.sh
+++ b/3.7-rc/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh
index cd806cbf..9fe74a63 100755
--- a/3.7/alpine/docker-entrypoint.sh
+++ b/3.7/alpine/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh
index 99ae42be..dcf8fb88 100755
--- a/3.7/debian/docker-entrypoint.sh
+++ b/3.7/debian/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh
index 99ae42be..dcf8fb88 100755
--- a/3.7/docker-entrypoint.sh
+++ b/3.7/docker-entrypoint.sh
@@ -64,6 +64,7 @@ rabbitConfigKeys=(
 	default_user
 	default_vhost
 	hipe_compile
+	queue_master_locator
 	vm_memory_high_watermark
 )
 fileConfigKeys=(