diff --git a/archetype-common/src/main/mdo/archetype.mdo b/archetype-common/src/main/mdo/archetype.mdo
index 948db05e..2847084a 100644
--- a/archetype-common/src/main/mdo/archetype.mdo
+++ b/archetype-common/src/main/mdo/archetype.mdo
@@ -21,8 +21,8 @@ under the License.
 
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
-       xml.namespace="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/${version}"
-       xml.schemaLocation="http://maven.apache.org/xsd/archetype-catalog-${version}.xsd">
+       xml.namespace="https://maven.apache.org/plugins/maven-archetype-plugin/archetype/${version}"
+       xml.schemaLocation="https://maven.apache.org/xsd/archetype-${version}.xsd">
   <id>archetype</id>
   <name>Archetype</name>
   <description>
diff --git a/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo b/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
index 541f88c9..40a6e4b8 100644
--- a/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
+++ b/archetype-models/archetype-catalog/src/main/mdo/archetype-catalog.mdo
@@ -19,8 +19,8 @@
   -->
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
-       xml.namespace="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/${version}"
-       xml.schemaLocation="http://maven.apache.org/xsd/archetype-catalog-${version}.xsd">
+       xml.namespace="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/${version}"
+       xml.schemaLocation="https://maven.apache.org/xsd/archetype-catalog-${version}.xsd">
   <id>archetype-catalog</id>
   <name>ArchetypeCatalog</name>
   <description>
diff --git a/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo b/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
index 9977c2f1..bbb026ae 100644
--- a/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
+++ b/archetype-models/archetype-descriptor/src/main/mdo/archetype-descriptor.mdo
@@ -21,8 +21,8 @@
 <!-- START SNIPPET: modello-model --><!-- for https://maven.apache.org/guides/mini/guide-using-modello.html -->
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
-       xml.namespace="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/${version}"
-       xml.schemaLocation="http://maven.apache.org/xsd/archetype-catalog-${version}.xsd">
+       xml.namespace="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/${version}"
+       xml.schemaLocation="https://maven.apache.org/xsd/archetype-descriptor-${version}.xsd">
   <id>archetype-descriptor</id>
   <name>ArchetypeDescriptor</name>
   <description>