diff --git a/jgroups-spring-boot-autoconfigure/src/main/java/org/axonframework/extensions/jgroups/autoconfig/JGroupsAutoConfiguration.java b/jgroups-spring-boot-autoconfigure/src/main/java/org/axonframework/extensions/jgroups/autoconfig/JGroupsAutoConfiguration.java
index 563d097..b4f40af 100644
--- a/jgroups-spring-boot-autoconfigure/src/main/java/org/axonframework/extensions/jgroups/autoconfig/JGroupsAutoConfiguration.java
+++ b/jgroups-spring-boot-autoconfigure/src/main/java/org/axonframework/extensions/jgroups/autoconfig/JGroupsAutoConfiguration.java
@@ -64,7 +64,7 @@ public class JGroupsAutoConfiguration {
 
     @ConditionalOnProperty("axon.distributed.jgroups.gossip.autoStart")
     @Bean(destroyMethod = "stop")
-    public GossipRouter gossipRouter() {
+    public GossipRouter gossipRouter() throws Exception {
         Matcher matcher =
                 Pattern.compile("([^[\\[]]*)\\[(\\d*)\\]").matcher(properties.getJgroups().getGossip().getHosts());
         if (matcher.find()) {
diff --git a/jgroups-spring-boot-autoconfigure/src/main/resources/default_tcp_gossip.xml b/jgroups-spring-boot-autoconfigure/src/main/resources/default_tcp_gossip.xml
index 146f773..65fddac 100644
--- a/jgroups-spring-boot-autoconfigure/src/main/resources/default_tcp_gossip.xml
+++ b/jgroups-spring-boot-autoconfigure/src/main/resources/default_tcp_gossip.xml
@@ -20,7 +20,8 @@
          sock_conn_timeout="300"/>
     <TCPGOSSIP initial_hosts="${jgroups.tunnel.gossip_router_hosts}"/>
     <MERGE3/>
-    <FD/>
+    <FD_SOCK/>
+    <FD_ALL/>
     <VERIFY_SUSPECT/>
     <pbcast.NAKACK2 use_mcast_xmit="false"/>
     <UNICAST3/>
diff --git a/jgroups/src/main/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnector.java b/jgroups/src/main/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnector.java
index e4237ed..959bcc4 100644
--- a/jgroups/src/main/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnector.java
+++ b/jgroups/src/main/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnector.java
@@ -46,11 +46,7 @@
 import org.axonframework.tracing.Span;
 import org.axonframework.tracing.SpanFactory;
 import org.axonframework.tracing.SpanScope;
-import org.jgroups.Address;
-import org.jgroups.JChannel;
-import org.jgroups.Message;
-import org.jgroups.Receiver;
-import org.jgroups.View;
+import org.jgroups.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -292,21 +288,6 @@ public synchronized void viewAccepted(final View view) {
         currentView = view;
     }
 
-    @Override
-    public void suspect(Address suspectedMember) {
-        logger.warn("Member is suspect: {}", suspectedMember);
-    }
-
-    @Override
-    public void block() {
-        //We are not going to block
-    }
-
-    @Override
-    public void unblock() {
-        //We are not going to block
-    }
-
     @Override
     public void receive(Message msg) {
         executorService.execute(() -> {
@@ -444,7 +425,7 @@ private void sendMyConfigurationTo(Address endpoint, boolean expectReply, int or
         try {
             logger.info("Sending my configuration to {}.", getOrDefault(endpoint, "all nodes"));
             Message returnJoinMessage =
-                    new Message(endpoint, new JoinMessage(this.loadFactor, this.commandFilter, order, expectReply));
+                    new ObjectMessage(endpoint, new JoinMessage(this.loadFactor, this.commandFilter, order, expectReply));
             returnJoinMessage.setFlag(Message.Flag.OOB);
             channel.send(returnJoinMessage);
         } catch (Exception e) {
diff --git a/jgroups/src/test/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnectorTest.java b/jgroups/src/test/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnectorTest.java
index d8e5681..808aa88 100644
--- a/jgroups/src/test/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnectorTest.java
+++ b/jgroups/src/test/java/org/axonframework/extensions/jgroups/commandhandling/JGroupsConnectorTest.java
@@ -41,6 +41,7 @@
 import org.jgroups.Address;
 import org.jgroups.JChannel;
 import org.jgroups.Message;
+import org.jgroups.ObjectMessage;
 import org.jgroups.stack.IpAddress;
 import org.junit.jupiter.api.*;
 
@@ -228,7 +229,7 @@ void messagesReceivedPromptlyAfterConnectingDoesntCauseException() throws Except
                                      .build();
 
         doAnswer(i -> {
-            connector1.receive(new Message(
+            connector1.receive(new ObjectMessage(
                     null,
                     new JoinMessage(100, new CommandNameFilter("test"), 0, false)).setSrc(channel2.address())
             );
@@ -296,7 +297,7 @@ void joinMessageReceivedForDisconnectedHost() throws Exception {
         waitForConnectorSync();
 
         // secretly insert an illegal message
-        Message message = new Message(channel1.getAddress(),
+        Message message = new ObjectMessage(channel1.getAddress(),
                                       new JoinMessage(10, DenyAll.INSTANCE, 0, true));
         message.setSrc(new IpAddress(12345));
         channel1.getReceiver().receive(message);
diff --git a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_gossip.xml b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_gossip.xml
index 65a6c5e..345b795 100644
--- a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_gossip.xml
+++ b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_gossip.xml
@@ -31,7 +31,8 @@
          sock_conn_timeout="300"/>
     <TCPGOSSIP initial_hosts="${jgroups.tunnel.gossip_router_hosts:127.0.0.1[12001]}" reconnect_interval="500"/>
     <MERGE3/>
-    <FD/>
+    <FD_SOCK/>
+    <FD_ALL/>
     <VERIFY_SUSPECT/>
     <pbcast.NAKACK2 use_mcast_xmit="false"/>
     <UNICAST3/>
diff --git a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_mcast.xml b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_mcast.xml
index 8c5fa00..a6ab3f2 100644
--- a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_mcast.xml
+++ b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_mcast.xml
@@ -32,7 +32,6 @@
             ucast_send_buf_size="5M"
             mcast_recv_buf_size="5M"
             mcast_send_buf_size="5M"
-            max_bundle_size="64K"
             max_bundle_timeout="30"
             enable_diagnostics="true"
             thread_naming_pattern="cl"
@@ -82,7 +81,7 @@
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="4M"/>
     <pbcast.GMS print_local_addr="true" join_timeout="2000"
-                view_bundling="true"/>
+                />
     <UFC max_credits="2M"
          min_threshold="0.4"/>
     <MFC max_credits="2M"
diff --git a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_static.xml b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_static.xml
index 504890b..b50893b 100644
--- a/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_static.xml
+++ b/jgroups/src/test/resources/org/axonframework/extensions/jgroups/commandhandling/tcp_static.xml
@@ -29,7 +29,6 @@
          bind_addr="127.0.0.1"
          recv_buf_size="${tcp.recv_buf_size:5M}"
          send_buf_size="${tcp.send_buf_size:5M}"
-         max_bundle_size="64K"
          sock_conn_timeout="300"
 
          thread_pool.enabled="true"
@@ -43,16 +42,16 @@
     <MERGE3  min_interval="10000"
              max_interval="30000"/>
     <FD_SOCK/>
-    <FD timeout="3000" max_tries="3" />
+    <FD_ALL timeout="3000"/>
     <VERIFY_SUSPECT timeout="1500"  />
     <BARRIER />
     <pbcast.NAKACK2 use_mcast_xmit="false"
                     discard_delivered_msgs="true"/>
     <UNICAST3 />
-    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+    <pbcast.STABLE desired_avg_gossip="50000"
                    max_bytes="4M"/>
     <pbcast.GMS print_local_addr="true" join_timeout="2000"
-                view_bundling="true"/>
+               />
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
diff --git a/pom.xml b/pom.xml
index 4ed6d89..9c3feb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         </sonar.coverage.jacoco.xmlReportPaths>
 
         <axon.version>4.12.0</axon.version>
-        <jgroups.version>4.2.30.Final</jgroups.version>
+        <jgroups.version>5.5.2.Final</jgroups.version>
 
         <spring.version>5.3.39</spring.version>
         <spring.boot.version>2.7.18</spring.boot.version>