diff --git a/pom.xml b/pom.xml
index 1f464a55..67a6eeef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <description>Mule connector lets you easily send and receive messages to queues and topics for any message service which implements the JMS specification</description>
 
     <properties>
-        <activemq.version>5.14.5</activemq.version>
+        <activemq.version>5.16.4</activemq.version>
         <artemisVersion>2.25.0</artemisVersion>
         <javaxJmsApiVersion>2.0.1</javaxJmsApiVersion>
         <commonsIoVersion>2.11.0</commonsIoVersion>
@@ -40,9 +40,9 @@
         <!-- Remove when a new parent version with MTF is available -->
         <munit.input.directory>src/test/munit</munit.input.directory>
         <munit.output.directory>${basedir}/target/test-mule/munit</munit.output.directory>
-        <munit.extensions.maven.plugin.version>1.1.3</munit.extensions.maven.plugin.version>
-        <munit.version>2.3.15</munit.version>
-        <mtf-tools.version>1.1.2</mtf-tools.version>
+        <munit.extensions.maven.plugin.version>1.2.0-SNAPSHOT</munit.extensions.maven.plugin.version>
+        <munit.version>3.1.0-SNAPSHOT</munit.version>
+        <mtf-tools.version>1.2.0-SNAPSHOT</mtf-tools.version>
         <mavenResources.version>3.3.0</mavenResources.version>
         <docker.maven.plugin.version>0.41.0</docker.maven.plugin.version>
         <maven.helper.plugin.version>3.3.0</maven.helper.plugin.version>
@@ -55,6 +55,7 @@
         <license.maven.plugin.version>4.2</license.maven.plugin.version>
         <licensePath>LICENSE_HEADER_CPAL.txt</licensePath>
         <licenseYear>2023</licenseYear>
+        <mtf.javaopts></mtf.javaopts>
     </properties>
 
     <dependencies>
@@ -359,6 +360,11 @@
                             <includeSnapshots>true</includeSnapshots>
                         </discoverRuntimes>
                     </runtimeConfiguration>
+                    <environmentVariables>
+                        <!-- Toggles the JDK17 style flag -->
+                        <!-- ugly hack -->
+                        <_JAVA_OPTIONS>-XX:+PrintCommandLineFlags ${mtf.javaopts}</_JAVA_OPTIONS>
+                    </environmentVariables>
                 </configuration>
                 <dependencies>
                     <dependency>
diff --git a/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java b/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java
index 6f74a977..60f7a7f3 100644
--- a/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java
+++ b/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java
@@ -10,6 +10,7 @@
 import static org.mule.runtime.api.meta.ExpressionSupport.NOT_SUPPORTED;
 import static org.mule.runtime.core.api.util.ClassUtils.instantiateClass;
 
+import org.apache.activemq.ActiveMQXAConnectionFactory;
 import org.mule.extensions.jms.api.connection.factory.activemq.ActiveMQConnectionFactoryConfiguration;
 import org.mule.extensions.jms.api.exception.JmsMissingLibraryException;
 import org.mule.extensions.jms.internal.connection.exception.ActiveMQException;
@@ -25,6 +26,7 @@
 import java.util.List;
 
 import javax.jms.ConnectionFactory;
+import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.slf4j.Logger;
@@ -86,6 +88,8 @@ ConnectionFactory createDefaultConnectionFactory(boolean useSsl) throws ActiveMQ
 
       this.connectionFactory = (ConnectionFactory) instantiateClass(factoryClass, factoryConfiguration.getBrokerUrl());
       applyVendorSpecificConnectionFactoryProperties(connectionFactory);
+      if (this.connectionFactory instanceof ActiveMQXAConnectionFactory)
+        ((ActiveMQXAConnectionFactory) connectionFactory).setXaAckMode(Session.AUTO_ACKNOWLEDGE);
       return connectionFactory;
     } catch (ClassNotFoundException e) {
       String message =
diff --git a/src/test/munit/reconnection/reconnection-config.xml b/src/test/munit/reconnection/reconnection-config.xml
index d0a7f90f..b900c00e 100644
--- a/src/test/munit/reconnection/reconnection-config.xml
+++ b/src/test/munit/reconnection/reconnection-config.xml
@@ -16,9 +16,9 @@
         <jms:caching-strategy >
             <jms:no-caching />
         </jms:caching-strategy>
-        <!--<jms:xa-connection-pool minPoolSize="5" />-->
-        <!--<jms:factory-configuration enable-xa="true" brokerUrl="tcp://0.0.0.0:${connection.lost.port}" maxRedelivery="1"/>-->
-        <jms:factory-configuration brokerUrl="tcp://0.0.0.0:${connection.lost.port}"/>
+        <jms:xa-connection-pool minPoolSize="5" />
+        <jms:factory-configuration enable-xa="true" brokerUrl="tcp://0.0.0.0:${connection.lost.port}" maxRedelivery="-1"/>
+<!--        <jms:factory-configuration brokerUrl="tcp://0.0.0.0:${connection.lost.port}"/>-->
     </jms:active-mq-connection>
 
 </jms:config>