diff --git a/source/includes/common-mc-admin-config.rst b/source/includes/common-mc-admin-config.rst
index 53798ec9..b1250680 100644
--- a/source/includes/common-mc-admin-config.rst
+++ b/source/includes/common-mc-admin-config.rst
@@ -838,7 +838,8 @@ Specify the SASL mechanism to use for authenticating to the Kafka broker(s).
 MinIO supports the following mechanisms:
 
 - ``PLAIN`` (Default)
-- ``SCRAM``
+- ``SHA256``
+- ``SHA512``
 
 .. end-minio-notify-kafka-sasl-mechanism
 
@@ -852,17 +853,17 @@ more information on possible values for this field.
 
 .. end-minio-notify-kafka-tls-client-auth
 
-.. start-minio-notify-kafka-sasl
+.. start-minio-notify-kafka-sasl-root
 
 Specify ``on`` to enable SASL authentication.
 
-.. end-minio-notify-kafka-sasl
+.. end-minio-notify-kafka-sasl-root
 
-.. start-minio-notify-kafka-tls
+.. start-minio-notify-kafka-tls-root
 
 Specify ``on`` to enable TLS connectivity to the Kafka broker(s)
 
-.. end-minio-notify-kafka-tls
+.. end-minio-notify-kafka-tls-root
 
 .. start-minio-notify-kafka-tls-skip-verify
 
diff --git a/source/monitoring/bucket-notifications/publish-events-to-kafka.rst b/source/monitoring/bucket-notifications/publish-events-to-kafka.rst
index dd01e107..07d3979e 100644
--- a/source/monitoring/bucket-notifications/publish-events-to-kafka.rst
+++ b/source/monitoring/bucket-notifications/publish-events-to-kafka.rst
@@ -132,7 +132,6 @@ You can configure a new Kafka service endpoint using either environment variable
             sasl_password="<string>" \
             sasl_mechanism="<string>" \
             tls_client_auth="<string>" \
-            sasl="<string>" \
             tls="<string>" \
             tls_skip_verify="<string>" \
             client_tls_cert="<string>" \
@@ -306,16 +305,17 @@ for the Kafka service endpoint:
    :class: copyable
 
    mc admin config set ALIAS/ notify_kafka:<IDENTIFIER> \
-      url="https://kafka1.example.net:9200, https://kafka2.example.net:9200" \
-      exchange="<string>" \
-      exchange_type="<string>" \
-      routing_key="<string>" \
-      mandatory="<string>" \
-      durable="<string>" \
-      no_wait="<string>" \
-      internal="<string>" \
-      auto_deleted="<string>" \
-      delivery_mode="<string>" \
+      brokers="https://kafka1.example.net:9200, https://kafka2.example.net:9200" \
+      topic="<string>" \
+      sasl_username="<string>" \
+      sasl_password="<string>" \
+      sasl_mechanism="<string>" \
+      tls_client_auth="<string>" \
+      tls="<string>" \
+      tls_skip_verify="<string>" \
+      client_tls_cert="<string>" \
+      client_tls_key="<string>" \
+      version="<string>" \
       queue_dir="<string>" \
       queue_limit="<string>" \
       comment="<string>"
@@ -356,7 +356,7 @@ Kafka target similar to the following:
 
    SQS ARNs: arn:minio:sqs::primary:kafka
 
-3) Validate the Changes
+4) Validate the Changes
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 Perform an action on a bucket which has an event configuration using the updated
diff --git a/source/reference/minio-mc-admin/mc-admin.config.rst b/source/reference/minio-mc-admin/mc-admin.config.rst
index 473b9565..f9ac7719 100644
--- a/source/reference/minio-mc-admin/mc-admin.config.rst
+++ b/source/reference/minio-mc-admin/mc-admin.config.rst
@@ -1586,8 +1586,8 @@ using these environment variables.
 
 .. mc-conf:: notify_kafka
 
-   The top-level configuration key for defining an Kafka service endpoint for use
-   with :ref:`MinIO bucket notifications <minio-bucket-notifications>`.
+   The top-level configuration key for defining an Kafka service endpoint for
+   use with :ref:`MinIO bucket notifications <minio-bucket-notifications>`.
 
    Use :mc-cmd:`mc admin config set` to set or update an Kafka service endpoint.
    The :mc-conf:`~notify_kafka.brokers` argument is *required* for each target.
@@ -1690,26 +1690,14 @@ using these environment variables.
       This configuration setting corresponds to the
       :ENVVAR:`MINIO_NOTIFY_KAFKA_TLS_CLIENT_AUTH` ENVIRONMENT VARIABLE
 
-   .. mc-conf:: sasl
-      :delimiter: " "
-
-      *Optional*
-
-      .. include:: /includes/common-mc-admin-config.rst
-         :start-after: start-minio-notify-kafka-sasl
-         :end-before: end-minio-notify-kafka-sasl
-
-      This configuration setting corresponds to the
-      :ENVVAR:`MINIO_NOTIFY_KAFKA_SASL` ENVIRONMENT VARIABLE
-
    .. mc-conf:: tls
       :delimiter: " "
 
       *Optional*
 
       .. include:: /includes/common-mc-admin-config.rst
-         :start-after: start-minio-notify-kafka-tls
-         :end-before: end-minio-notify-kafka-tls
+         :start-after: start-minio-notify-kafka-tls-root
+         :end-before: end-minio-notify-kafka-tls-root
 
       This configuration setting corresponds to the
       :ENVVAR:`MINIO_NOTIFY_KAFKA_TLS` ENVIRONMENT VARIABLE
diff --git a/source/reference/minio-server/minio-server.rst b/source/reference/minio-server/minio-server.rst
index dbcc8642..62863fdc 100644
--- a/source/reference/minio-server/minio-server.rst
+++ b/source/reference/minio-server/minio-server.rst
@@ -1950,8 +1950,8 @@ endpoints as ``PRIMARY`` and ``SECONDARY`` respectively:
    *Optional*
 
    .. include:: /includes/common-mc-admin-config.rst
-      :start-after: start-minio-notify-kafka-sasl
-      :end-before: end-minio-notify-kafka-sasl
+      :start-after: start-minio-notify-kafka-sasl-root
+      :end-before: end-minio-notify-kafka-sasl-root
 
    This environment variable corresponds to the
    :mc-conf:`notify_kafka sasl <notify_kafka.sasl>`
@@ -1962,8 +1962,8 @@ endpoints as ``PRIMARY`` and ``SECONDARY`` respectively:
    *Optional*
 
    .. include:: /includes/common-mc-admin-config.rst
-      :start-after: start-minio-notify-kafka-tls
-      :end-before: end-minio-notify-kafka-tls
+      :start-after: start-minio-notify-kafka-tls-root
+      :end-before: end-minio-notify-kafka-tls-root
 
    This environment variable corresponds to the
    :mc-conf:`notify_kafka tls <notify_kafka.tls>`