diff --git a/ansible/roles/kafka/templates/kafka.server.properties.j2 b/ansible/roles/kafka/templates/kafka.server.properties.j2
index 6e6058b70f..db3ada59c0 100644
--- a/ansible/roles/kafka/templates/kafka.server.properties.j2
+++ b/ansible/roles/kafka/templates/kafka.server.properties.j2
@@ -1,4 +1,6 @@
 listeners=PLAINTEXT://{{ api_interface_address }}:{{ kafka_port }}
+controlled.shutdown.enable=true
+auto.leader.rebalance.enable=true
 num.network.threads=3
 num.io.threads=8
 socket.send.buffer.bytes=102400