diff --git a/docs/admin/system-overview.rst b/docs/admin/system-overview.rst
index 443ed102..23cf79da 100644
--- a/docs/admin/system-overview.rst
+++ b/docs/admin/system-overview.rst
@@ -13,7 +13,7 @@ System Architecture
 
 The following diagram shows a typical production architecture.
 
-.. image:: ../images/architecture-diagram.png
+.. image:: ../images/rhodecode-v5x-diagram.png
   :align: center
 
 Supported Operating Systems
diff --git a/docs/auth/auth-saml-azure.rst b/docs/auth/auth-saml-azure.rst
index 1880e408..9cedc814 100644
--- a/docs/auth/auth-saml-azure.rst
+++ b/docs/auth/auth-saml-azure.rst
@@ -178,4 +178,10 @@ attributes for RhodeCode integration:
 
 .. image:: ../images/azure-attrs-claims.png
    :alt: Azure attributes and claims configuration
+   :scale: 50 %
+
+Finally, configure the corresponding SAML attributes in RhodeCode to match the Azure claims configuration:
+
+.. image:: ../images/rhodecode-saml-claims.png
+   :alt: RhodeCode SAML Azure configuration form
    :scale: 50 %
\ No newline at end of file
diff --git a/docs/images/architecture-diagram.png b/docs/images/4x-architecture-diagram.png
similarity index 100%
rename from docs/images/architecture-diagram.png
rename to docs/images/4x-architecture-diagram.png
diff --git a/docs/images/rhodecode-saml-claims.png b/docs/images/rhodecode-saml-claims.png
new file mode 100644
index 00000000..f14a6398
Binary files /dev/null and b/docs/images/rhodecode-saml-claims.png differ
diff --git a/docs/images/rhodecode-v5x-diagram.png b/docs/images/rhodecode-v5x-diagram.png
new file mode 100644
index 00000000..ba3b8be4
Binary files /dev/null and b/docs/images/rhodecode-v5x-diagram.png differ