diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
index 69e2d95291..94c955b768 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
 ${security-manager-settings}
 
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
index 8aa3ace33e..a959d2d5bb 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <!--<connector connector-port="1099"/>-->
    <authorisation>
       <allowlist>
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index 86c8d4f1eb..332c5f86d4 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -98,7 +98,7 @@
                         <mkdir dir="${project.build.directory}/schema/org.apache.activemq/dto" />
                         <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto" />
                         <schemagen srcdir="${basedir}/src" destdir="${project.build.directory}/schema/org.apache.activemq/dto" includeantruntime="false">
-                           <schema namespace="http://activemq.org/schema" file="activemq.xsd" />
+                           <schema namespace="http://activemq.apache.org/schema" file="activemq.xsd" />
                            <classpath refid="maven.compile.classpath" />
                            <include name="**/package-info.java" />
                            <include name="**/*DTO.java" />
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
index 0a8b297ee4..8f99fa1f9f 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
@@ -18,6 +18,6 @@
  * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
  */
 @javax.xml.bind.annotation.XmlSchema(
-   namespace = "http://activemq.org/schema",
+   namespace = "http://activemq.apache.org/schema",
    elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.activemq.artemis.dto;
diff --git a/artemis-web/src/test/resources/bootstrap_secure_web.xml b/artemis-web/src/test/resources/bootstrap_secure_web.xml
index c726aa9cab..4c77a30274 100644
--- a/artemis-web/src/test/resources/bootstrap_secure_web.xml
+++ b/artemis-web/src/test/resources/bootstrap_secure_web.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/artemis-web/src/test/resources/bootstrap_web.xml b/artemis-web/src/test/resources/bootstrap_web.xml
index a23dbfa332..ac161bd777 100644
--- a/artemis-web/src/test/resources/bootstrap_web.xml
+++ b/artemis-web/src/test/resources/bootstrap_web.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/artemis-web/src/test/resources/bootstrap_web_codec.xml b/artemis-web/src/test/resources/bootstrap_web_codec.xml
index 1c250b1a6b..be4b26aaa7 100644
--- a/artemis-web/src/test/resources/bootstrap_web_codec.xml
+++ b/artemis-web/src/test/resources/bootstrap_web_codec.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/artemis-web/src/test/resources/bootstrap_web_old_config.xml b/artemis-web/src/test/resources/bootstrap_web_old_config.xml
index 981c910919..fdcbd4a254 100644
--- a/artemis-web/src/test/resources/bootstrap_web_old_config.xml
+++ b/artemis-web/src/test/resources/bootstrap_web_old_config.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 10a807f64e..197df0e697 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -1256,7 +1256,7 @@ either:
 Here's an example of the single bootstrap user configuration:
 
 ```xml
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <security-manager class-name="org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager">
       <property key="bootstrapUser" value="myUser"/>
@@ -1276,7 +1276,7 @@ If your use-case requires *multiple* users to be available when the broker
 starts then you can use a configuration like this:
 
 ```xml
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <security-manager class-name="org.apache.activemq.artemis.spi.core.security.ActiveMQBasicSecurityManager">
       <property key="bootstrapUserFile" value="artemis-users.properties"/>
@@ -1560,7 +1560,7 @@ provide JAAS integration, but users can provide their own implementation of
 configure it in `bootstrap.xml` using the `security-manager` element, e.g.:
 
 ```xml
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <security-manager class-name="com.foo.MySecurityManager">
       <property key="myKey1" value="myValue1"/>
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index c2426a3231..46807d28fe 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -451,7 +451,7 @@ further for additional details as appropriate.
 The `bootstrap.xml` file is very simple. Let's take a look at an example:
 
 ```xml
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/docs/user-manual/en/versions.md b/docs/user-manual/en/versions.md
index 0c74501c7a..86cf05894d 100644
--- a/docs/user-manual/en/versions.md
+++ b/docs/user-manual/en/versions.md
@@ -508,7 +508,7 @@ Highlights:
 
 1. Create `<ARTEMIS_INSTANCE>/etc/management.xml`. At the very least, the file must contain this:
    ```xml
-   <management-context xmlns="http://activemq.org/schema"/>
+   <management-context xmlns="http://activemq.apache.org/schema"/>
    ```
    This configures role based authorisation for JMX. Read more in the [Management](management.md) documentation.
 1. If configured, remove the Jolokia war file from the `web` element in `<ARTEMIS_INSTANCE>/etc/bootstrap.xml`:
diff --git a/examples/features/standard/camel/camel-broker/src/main/resources/activemq/server0/bootstrap.xml b/examples/features/standard/camel/camel-broker/src/main/resources/activemq/server0/bootstrap.xml
index 6964b19fc7..63515a0445 100644
--- a/examples/features/standard/camel/camel-broker/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/features/standard/camel/camel-broker/src/main/resources/activemq/server0/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml b/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
index 4005e9ad07..3bd3cc50f5 100644
--- a/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/jmx-ssl/src/main/resources/activemq/server0/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector
          connector-port="1099"
          connector-host="localhost"
diff --git a/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml b/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
index b497c34369..d894b9f150 100644
--- a/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/jmx/src/main/resources/activemq/server0/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="1099" connector-host="localhost"/>
    <authorisation>
       <allowlist>
diff --git a/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml b/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
index 8460d9efea..3624d6f424 100644
--- a/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
+++ b/examples/features/standard/message-counters/src/main/resources/activemq/server0/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="1099" connector-host="127.0.0.1"/>
    <authorisation>
       <allowlist>
diff --git a/examples/features/standard/security-manager/src/main/resources/activemq/server0/bootstrap.xml b/examples/features/standard/security-manager/src/main/resources/activemq/server0/bootstrap.xml
index 1c9db58ff5..d586419558 100644
--- a/examples/features/standard/security-manager/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/features/standard/security-manager/src/main/resources/activemq/server0/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <security-manager class-name="org.apache.activemq.artemis.jms.example.JAASSecurityManagerWrapper">
       <property key="domain" value="activemq"/>
diff --git a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml b/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
index 2d753e7de1..c870f2371a 100644
--- a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq" certificate-domain="activemq-cert"/>
 
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
index 2eabc517a6..7fb81006ca 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
+++ b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq" certificate-domain="activemq-cert"/>
 
diff --git a/tests/smoke-tests/src/main/resources/containerService/bootstrap.xml b/tests/smoke-tests/src/main/resources/containerService/bootstrap.xml
index 611625e725..55e64fcd28 100644
--- a/tests/smoke-tests/src/main/resources/containerService/bootstrap.xml
+++ b/tests/smoke-tests/src/main/resources/containerService/bootstrap.xml
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<broker xmlns="http://activemq.org/schema">
+<broker xmlns="http://activemq.apache.org/schema">
 
    <jaas-security domain="activemq"/>
 
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging/management.xml b/tests/smoke-tests/src/main/resources/servers/audit-logging/management.xml
index e7f01cfdee..eb8a057e62 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
    <authorisation>
       <allowlist>
diff --git a/tests/smoke-tests/src/main/resources/servers/audit-logging2/management.xml b/tests/smoke-tests/src/main/resources/servers/audit-logging2/management.xml
index e7f01cfdee..eb8a057e62 100644
--- a/tests/smoke-tests/src/main/resources/servers/audit-logging2/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/audit-logging2/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
    <authorisation>
       <allowlist>
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/management.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup-withping/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/management.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-backup/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/management.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-noretrydns/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/management.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main-withping/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/management.xml b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/dnsswitch-replicated-main/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx-failback1/management.xml b/tests/smoke-tests/src/main/resources/servers/jmx-failback1/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx-failback1/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx-failback1/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx-failback2/management.xml b/tests/smoke-tests/src/main/resources/servers/jmx-failback2/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx-failback2/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx-failback2/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx-rbac/management.xml b/tests/smoke-tests/src/main/resources/servers/jmx-rbac/management.xml
index f0ac0392a1..5a98b2ea6d 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx-rbac/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx-rbac/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099"/>
    <authorisation>
       <allowlist>
diff --git a/tests/smoke-tests/src/main/resources/servers/jmx/management.xml b/tests/smoke-tests/src/main/resources/servers/jmx/management.xml
index 0c4656b9f2..79655e255d 100644
--- a/tests/smoke-tests/src/main/resources/servers/jmx/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/jmx/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost" rmi-registry-port="10098" />
    <authorisation>
       <allowlist>
diff --git a/tests/smoke-tests/src/main/resources/servers/replay/replay/management.xml b/tests/smoke-tests/src/main/resources/servers/replay/replay/management.xml
index 4b1cf061ad..2f581f6eca 100644
--- a/tests/smoke-tests/src/main/resources/servers/replay/replay/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replay/replay/management.xml
@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
   <connector connector-port="1099"/>
    <authorisation>
       <allowlist>
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/management.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master1/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/management.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master2/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/management.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/management.xml
index 9de3c59cad..f70d9ba23d 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-master3/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10299" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/management.xml b/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/management.xml
index f9ae2f9460..2731e79717 100644
--- a/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/replicated-failback-slave1/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10399" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/management.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationBackup/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/management.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimary/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/management.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/management.xml
index 576f1e5995..af79aa558f 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerA/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10099" connector-host="localhost"/>
 </management-context>
\ No newline at end of file
diff --git a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/management.xml b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/management.xml
index 14bbaf2218..117292d7e9 100644
--- a/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/management.xml
+++ b/tests/smoke-tests/src/main/resources/servers/zkReplicationPrimaryPeerB/management.xml
@@ -15,6 +15,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<management-context xmlns="http://activemq.org/schema">
+<management-context xmlns="http://activemq.apache.org/schema">
    <connector connector-port="10199" connector-host="localhost"/>
 </management-context>
\ No newline at end of file