diff --git a/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm b/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
index 801a3998..9269cfaf 100644
--- a/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
+++ b/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
@@ -309,8 +309,8 @@ public class MyCustomDescriptorHandler implements ContainerDescriptorHandler {
   <<<test.properties>>>. With the following descriptor format
 
 +-----
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/${mdoVersion}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
   <id>dist</id>
   <formats>
     <format>zip</format>
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 286603b2..2cbc9151 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -115,6 +115,9 @@ ${project.name}
 
 * Assembly and Component Descriptor Schemas (XSD)
 
+  * {{{/xsd/assembly-2.2.0.xsd}https://maven.apache.org/xsd/assembly-2.2.0.xsd}},
+    {{{/xsd/assembly-component-2.2.0.xsd}https://maven.apache.org/xsd/assembly-component-2.2.0.xsd}} (for version 3.6.0 and higher)
+
   * {{{/xsd/assembly-2.1.1.xsd}https://maven.apache.org/xsd/assembly-2.1.1.xsd}},
     {{{/xsd/assembly-component-2.1.1.xsd}https://maven.apache.org/xsd/assembly-component-2.1.1.xsd}} (for version 3.4.0 and higher)