diff --git a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/internal/DefaultSchemaGenerator.java b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/internal/DefaultSchemaGenerator.java
index 31195b49..4e5d96f5 100644
--- a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/internal/DefaultSchemaGenerator.java
+++ b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/internal/DefaultSchemaGenerator.java
@@ -49,7 +49,7 @@
 public class DefaultSchemaGenerator implements SchemaGenerator {
 
     private static final String LOG4J_PREFIX = "log4j";
-    private static final String LOG4J_NAMESPACE = "http://logging.apache.org/log4j/2.0/config";
+    private static final String LOG4J_NAMESPACE = "http://logging.apache.org/xml/ns/config";
     private static final String XSD_NAMESPACE = XMLConstants.W3C_XML_SCHEMA_NS_URI;
     private static final String MULTIPLICITY_UNBOUNDED = "*";
     private static final String UTF_8 = "UTF-8";
diff --git a/log4j-docgen/src/main/mdo/plugins-model.xml b/log4j-docgen/src/main/mdo/plugins-model.xml
index ad1fbd60..815eeb37 100644
--- a/log4j-docgen/src/main/mdo/plugins-model.xml
+++ b/log4j-docgen/src/main/mdo/plugins-model.xml
@@ -17,7 +17,7 @@
   -->
 <model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0"
        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="https://logging.apache.org/log4j/plugins">
+       xml.namespace="https://logging.apache.org/xml/ns/plugins">
     <id>plugins</id>
     <name>PluginBundle</name>
     <description>Documents a set of Log4j plugins.</description>
diff --git a/log4j-docgen/src/main/resources/org/apache/logging/log4j/docgen/internal/configuration.xml b/log4j-docgen/src/main/resources/org/apache/logging/log4j/docgen/internal/configuration.xml
index 572baea6..e2b8d3fe 100644
--- a/log4j-docgen/src/main/resources/org/apache/logging/log4j/docgen/internal/configuration.xml
+++ b/log4j-docgen/src/main/resources/org/apache/logging/log4j/docgen/internal/configuration.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<pluginSet xmlns="https://logging.apache.org/log4j/plugins"
+<pluginSet xmlns="https://logging.apache.org/xml/ns/plugins"
               version="0.1.0">
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-core</artifactId>
diff --git a/log4j-docgen/src/test/resources/META-INF/log4j/plugins-sample.xml b/log4j-docgen/src/test/resources/META-INF/log4j/plugins-sample.xml
index 81b300a4..0edf04c0 100644
--- a/log4j-docgen/src/test/resources/META-INF/log4j/plugins-sample.xml
+++ b/log4j-docgen/src/test/resources/META-INF/log4j/plugins-sample.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<pluginSet xmlns="https://logging.apache.org/log4j/plugins" version="0.1.0">
+<pluginSet xmlns="https://logging.apache.org/xml/ns/plugins" version="0.1.0">
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-core</artifactId>
     <version>2.22.0</version>
diff --git a/log4j-docgen/src/test/resources/expected/xsd/log4j-config.xsd b/log4j-docgen/src/test/resources/expected/xsd/log4j-config.xsd
index 02f50c20..8be9a118 100644
--- a/log4j-docgen/src/test/resources/expected/xsd/log4j-config.xsd
+++ b/log4j-docgen/src/test/resources/expected/xsd/log4j-config.xsd
@@ -19,7 +19,7 @@
   ~ This is a test schema used in SchemaGeneratorTest.
   ~ Unlike this file the DefaultSchemaGenerator strips whitespace.
   -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:log4j="http://logging.apache.org/log4j/2.0/config" elementFormDefault="qualified" targetNamespace="http://logging.apache.org/log4j/2.0/config">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:log4j="http://logging.apache.org/xml/ns/config" elementFormDefault="qualified" targetNamespace="http://logging.apache.org/xml/ns/config">
   <element type="log4j:org.apache.logging.log4j.core.config.Configuration" name="Configuration"/>
   <simpleType name="org.apache.logging.log4j.Level">
     <annotation>