diff --git a/pom.xml b/pom.xml
index 91889e1ebb..38e452660d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,12 @@
                 <groupId>org.alfresco.services</groupId>
                 <artifactId>alfresco-messaging-repo</artifactId>
                 <version>${dependency.alfresco-messaging-repo.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-broker</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
@@ -728,6 +734,22 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-activemq</artifactId>
+                <version>${dependency.camel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-broker</artifactId>
+                    </exclusion>
+                    <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-amqp</artifactId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 5e6f6b30d5..960482cfac 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -667,6 +667,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-activemq</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-amqp</artifactId>
@@ -693,23 +697,6 @@
             <artifactId>activemq-client</artifactId>
             <version>${dependency.activemq.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-broker</artifactId>
-            <version>${dependency.activemq.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-activemq</artifactId>
-            <version>${dependency.camel.version}</version>
-            <exclusions>
-                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-pool</artifactId>
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml
deleted file mode 100644
index b03ebe6610..0000000000
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/activemq.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- START SNIPPET: example -->
-<beans
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-    <!-- Global properties used in property expansion throughout the container, overridable via JNDI or System properties -->
-    <bean id="global-properties" class="org.alfresco.config.JndiPropertiesFactoryBean">
-        <property name="locations">
-            <list>
-                <value>classpath:alfresco/repository.properties</value>
-                <value>alfresco/subsystems/Messaging/default/activemq/credentials.properties</value>
-                <value>alfresco/subsystems/Messaging/default/messaging.properties</value>
-                <!-- Enterprise defaults -->
-                <!--  Overrides supplied if this is an enterprise install (none exist for community) -->
-                <value>classpath*:alfresco/enterprise/repository.properties</value>
-                <!-- <value>classpath:alfresco/jndi.properties</value> -->
-                <!--  Overrides supplied by modules -->
-                <value>classpath*:alfresco/module/*/alfresco-global.properties</value>
-                <!--  Installer or user-provided defaults -->
-                <value>classpath*:alfresco-global.properties</value>
-            </list>
-        </property>
-        <property name="systemPropertiesModeName">
-            <value>SYSTEM_PROPERTIES_MODE_OVERRIDE</value>
-        </property>
-        <property name="propertiesPersister">
-            <bean class="org.alfresco.config.AlfrescoPropertiesPersister"/>
-        </property>
-    </bean>
-    
-    <bean id="activemq-placeholder-configurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="valueSeparator">
-            <null/>
-        </property>
-        <property name="ignoreUnresolvablePlaceholders">
-            <value>true</value>
-        </property>
-        <property name="searchSystemEnvironment">
-            <value>false</value>
-        </property>        
-        <property name="propertiesPersister">
-            <bean class="org.alfresco.config.AlfrescoPropertiesPersister"/>
-        </property>
-        <property name="properties">
-            <ref bean="global-properties"/>
-        </property>
-    </bean>
-
-    <!--
-        The <broker> element is used to configure the ActiveMQ broker.
-    -->
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
-
-        <!--
-            For better performances use VM cursor and small memory limit.
-            For more information, see:
-
-            http://activemq.apache.org/message-cursors.html
-
-            Also, if your producer is "hanging", it's probably due to producer flow control.
-            For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-        -->
-
-        <destinationPolicy>
-            <policyMap>
-              <policyEntries>
-                <policyEntry topic=">" producerFlowControl="true">
-                    <!-- The constantPendingMessageLimitStrategy is used to prevent
-                         slow topic consumers to block producers and affect other consumers
-                         by limiting the number of messages that are retained
-                         For more information, see:
-
-                         http://activemq.apache.org/slow-consumer-handling.html
-
-                    -->
-                  <pendingMessageLimitStrategy>
-                    <constantPendingMessageLimitStrategy limit="1000"/>
-                  </pendingMessageLimitStrategy>
-                </policyEntry>
-                <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
-                  <!-- Use VM cursor for better latency
-                       For more information, see:
-
-                       http://activemq.apache.org/message-cursors.html
-
-                  <pendingQueuePolicy>
-                    <vmQueueCursor/>
-                  </pendingQueuePolicy>
-                  -->
-                </policyEntry>
-              </policyEntries>
-            </policyMap>
-        </destinationPolicy>
-
-
-        <!--
-            The managementContext is used to configure how ActiveMQ is exposed in
-            JMX. By default, ActiveMQ uses the MBean server that is started by
-            the JVM. For more information, see:
-
-            http://activemq.apache.org/jmx.html
-        -->
-        <managementContext>
-            <managementContext createConnector="false"/>
-        </managementContext>
-
-        <!--
-            Configure message persistence for the broker. The default persistence
-            mechanism is the KahaDB store (identified by the kahaDB tag).
-            For more information, see:
-
-            http://activemq.apache.org/persistence.html
-        -->
-        <persistenceAdapter>
-            <kahaDB directory="${activemq.data}/kahadb"/>
-        </persistenceAdapter>
-
-
-          <!--
-            The systemUsage controls the maximum amount of space the broker will
-            use before slowing down producers. For more information, see:
-            http://activemq.apache.org/producer-flow-control.html
-            If using ActiveMQ embedded - the following limits could safely be used:
-
-        <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="20 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="1 gb"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="100 mb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-        -->
-          <systemUsage>
-            <systemUsage>
-                <memoryUsage>
-                    <memoryUsage limit="64 mb"/>
-                </memoryUsage>
-                <storeUsage>
-                    <storeUsage limit="100 gb"/>
-                </storeUsage>
-                <tempUsage>
-                    <tempUsage limit="50 gb"/>
-                </tempUsage>
-            </systemUsage>
-        </systemUsage>
-
-        <!--
-            The transport connectors expose ActiveMQ over a given protocol to
-            clients and other brokers. For more information, see:
-
-            http://activemq.apache.org/configuring-transports.html
-        -->
-        <transportConnectors>
-            <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
-            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
-            <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
-        </transportConnectors>
-
-        <!-- destroy the spring context on shutdown to stop jetty -->
-        <shutdownHooks>
-            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
-        </shutdownHooks>
-
-    </broker>
-
-    <!--
-        Enable web consoles, REST and Ajax APIs and demos
-
-        Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
-    -->
-    <!--  
-    <import resource="jetty.xml"/>
-    -->
-
-</beans>
-<!-- END SNIPPET: example -->
\ No newline at end of file
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties
deleted file mode 100644
index 7f56375075..0000000000
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/activemq/credentials.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-## 
-## http://www.apache.org/licenses/LICENSE-2.0
-## 
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Defines credentials that will be used by components (like web console) to access the broker
-
-activemq.username=system
-activemq.password=manager
-guest.password=password
\ No newline at end of file
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
index 4dd42cdb68..3c06c00252 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -11,7 +11,7 @@
 
     <context:component-scan base-package="org.alfresco.messaging.camel.configuration"/>
 
-    <bean id="messagingObjectMapper" class="org.gytheio.messaging.jackson.ObjectMapperFactory" 
+    <bean id="messagingObjectMapper" class="org.gytheio.messaging.jackson.ObjectMapperFactory"
         factory-method="createInstance" />
         
     <bean id="defaultDataFormat" class="org.apache.camel.component.jackson.JacksonDataFormat">
@@ -29,18 +29,24 @@
         <property name="connectionFactory" ref="pooledConnectionFactory"/>
     </bean>
 
-    <bean id="amqp" class="org.apache.camel.component.amqp.AMQPComponent">
+    <bean id="jmsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
         <property name="connectionFactory" ref="pooledConnectionFactory" />
         <property name="transacted" value="${messaging.transacted}" />
         <property name="transactionManager" ref="messagingTransactionManager" />
     </bean>
 
     <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
-        <property name="connectionFactory" ref="pooledConnectionFactory" />
-        <property name="transacted" value="${messaging.transacted}" />
-        <property name="transactionManager" ref="messagingTransactionManager" />
+        <property name="configuration" ref="jmsConfig"/>
     </bean>
-    
+
+    <bean id="activemq" class="org.apache.camel.component.activemq.ActiveMQComponent">
+        <property name="configuration" ref="jmsConfig"/>
+    </bean>
+
+    <bean id="amqp" class="org.apache.camel.component.amqp.AMQPComponent">
+        <property name="configuration" ref="jmsConfig"/>
+    </bean>
+
     <bean id="CAMEL_PROPAGATION_MANDATORY" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
         <property name="transactionManager" ref="messagingTransactionManager" />
         <property name="propagationBehaviorName" value="PROPAGATION_MANDATORY" />
@@ -82,7 +88,7 @@
         <camel:jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" />
         <template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" />
     </camelContext>
-    
+
     <import resource="defaultRoutes.xml" />
     <bean id="defaultRouteLoader" class="org.alfresco.messaging.camel.SpringContextRouteLoader">
         <property name="camelContextId" value="alfrescoCamelContext" />
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
index b7d6a3e7cc..48fb9ef838 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
@@ -1,8 +1,3 @@
-
-# Embedded broker persisting to ${dir.root}/activemq
-#messaging.broker.url=vm://localhost?brokerConfig=xbean:alfresco/subsystems/Messaging/default/activemq/activemq.xml
-#activemq.data=${dir.root}/activemq
-
 # External failover broker at tcp://localhost
 messaging.broker.url=failover:(tcp://localhost:61616)?timeout=3000&jms.useCompression=true
 messaging.broker.ssl=false