diff --git a/ansible/roles/kafka/templates/kafka.server.properties.j2 b/ansible/roles/kafka/templates/kafka.server.properties.j2
index 8743f6f587..6e6058b70f 100644
--- a/ansible/roles/kafka/templates/kafka.server.properties.j2
+++ b/ansible/roles/kafka/templates/kafka.server.properties.j2
@@ -16,3 +16,7 @@ log.segment.bytes=1073741824
 log.retention.check.interval.ms=300000
 zookeeper.connect={{ kafka_zookeeper }}
 zookeeper.connection.timeout.ms=6000
+{% if enable_monasca | bool %}
+log.message.format.version=0.9.0.0
+connections.max.idle.ms=31540000000
+{% endif %}
diff --git a/doc/source/reference/logging-and-monitoring/monasca-guide.rst b/doc/source/reference/logging-and-monitoring/monasca-guide.rst
index 3af3399464..43fe30bdb4 100644
--- a/doc/source/reference/logging-and-monitoring/monasca-guide.rst
+++ b/doc/source/reference/logging-and-monitoring/monasca-guide.rst
@@ -46,14 +46,6 @@ following override in ``/etc/kolla/globals.yml``:
 
    monasca_install_type: "source"
 
-Until the Monasca Kafka client is upgraded it is currently required
-to run Kafka in compatibility mode. This can be achieved by adding some
-custom Kafka configuration:
-
-.. code-block:: console
-
-   echo "log.message.format.version=0.9.0.0" >> /etc/kolla/config/kafka.server.properties
-
 Stand-alone configuration (optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~