diff --git a/changelog.d/4-docs/pr-2736 b/changelog.d/4-docs/pr-2736
new file mode 100644
index 0000000000..72a2a4159e
--- /dev/null
+++ b/changelog.d/4-docs/pr-2736
@@ -0,0 +1,2 @@
+JCT-146 - update outdated info
+SER-211 - update new info regarding nodetool use
diff --git a/docs/src/how-to/administrate/backup-disaster-recovery.md b/docs/src/how-to/administrate/backup-disaster-recovery.md
index 5d525b6601..d714036be8 100644
--- a/docs/src/how-to/administrate/backup-disaster-recovery.md
+++ b/docs/src/how-to/administrate/backup-disaster-recovery.md
@@ -71,6 +71,9 @@ Make sure (while connected via ssh) your Cassandra installation is doing well wi
 
     nodetool status
 
+or (in newer versions)
+
+    nodetool ::FFFF:127.0.0.1 status
 
 You should see a list of nodes like this:
 
diff --git a/docs/src/how-to/administrate/cassandra.rst b/docs/src/how-to/administrate/cassandra.rst
index cdb8fe8930..3ecc423ea5 100644
--- a/docs/src/how-to/administrate/cassandra.rst
+++ b/docs/src/how-to/administrate/cassandra.rst
@@ -15,6 +15,12 @@ To check the health of a Cassandra node, run the following command:
 
   ssh <ip of cassandra node> /opt/cassandra/bin/nodetool status
 
+or if you are running a newer version of wire-server (altough it should be backwards compatibile)
+
+.. code:: sh 
+
+  ssh <ip of cassandra node> /opt/cassandra/bin/nodetool ::FFFF:127.0.0.1 status
+
 You should see a list of nodes like this:
 
 .. code:: sh 
@@ -49,7 +55,7 @@ For maintenance you may need to restart the cluster.
 
 On each server one by one:
 
-1. check your cluster is healthy: ``nodetool status``
+1. check your cluster is healthy: ``nodetool status`` or ``nodetool ::FFFF:127.0.0.1 status`` (in newer versions)
 2. ``nodetool drain && systemctl stop cassandra`` (to stop accepting writes and flush data to disk; then stop the process)
 3. do any operation you need, if any
 4. Start the cassandra daemon process: ``systemctl start cassandra``
diff --git a/docs/src/understand/single-sign-on/main.rst b/docs/src/understand/single-sign-on/main.rst
index e12c4c69a0..8603a8fd71 100644
--- a/docs/src/understand/single-sign-on/main.rst
+++ b/docs/src/understand/single-sign-on/main.rst
@@ -256,7 +256,7 @@ You need to configure your SCIM client to use the following mandatory SCIM attri
 
 3. The ``externalId`` attribute:
 
-   a. If you are using Wire's SAML SSO feature then set ``externalId`` attribute to the same identifier used for ``NameID`` in your SAML configuration (both fields must match case sensitively).
+   a. If you are using Wire's SAML SSO feature then set ``externalId`` attribute to the same identifier used for ``NameID`` in your SAML configuration.
 
    b. If you are using email/password authentication then set the ``externalId``
       attribute to the user's email address. The user will receive an invitation email during provisioning. Also note that the account will be set to ``"active": false`` until the user has accepted the invitation and activated the account.