diff --git a/3.6/alpine/docker-entrypoint.sh b/3.6/alpine/docker-entrypoint.sh
index d73505de..e85dbb03 100755
--- a/3.6/alpine/docker-entrypoint.sh
+++ b/3.6/alpine/docker-entrypoint.sh
@@ -63,6 +63,7 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
+	heartbeat
 	hipe_compile
 	vm_memory_high_watermark
 )
@@ -218,7 +219,7 @@ rabbit_env_config() {
 
 		local rawVal=
 		case "$conf" in
-			verify|fail_if_no_peer_cert|depth)
+			verify|fail_if_no_peer_cert|depth|heartbeat)
 				[ "$val" ] || continue
 				rawVal="$val"
 				;;
diff --git a/3.6/debian/docker-entrypoint.sh b/3.6/debian/docker-entrypoint.sh
index 3f78ac07..6a33f95e 100755
--- a/3.6/debian/docker-entrypoint.sh
+++ b/3.6/debian/docker-entrypoint.sh
@@ -63,6 +63,7 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
+	heartbeat
 	hipe_compile
 	vm_memory_high_watermark
 )
@@ -218,7 +219,7 @@ rabbit_env_config() {
 
 		local rawVal=
 		case "$conf" in
-			verify|fail_if_no_peer_cert|depth)
+			verify|fail_if_no_peer_cert|depth|heartbeat)
 				[ "$val" ] || continue
 				rawVal="$val"
 				;;