diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
index 1961bb384ddd..97412df015c4 100644
--- a/container/features/src/main/resources/features.xml
+++ b/container/features/src/main/resources/features.xml
@@ -21,6 +21,7 @@
         <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-handler/${netty4Version}</bundle>
         <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-classes-epoll/${netty4Version}</bundle>
         <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-epoll/${netty4Version}</bundle>
+        <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-kqueue/${netty4Version}</bundle>
         <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-unix-common/${netty4Version}</bundle>
         <bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-codec/${netty4Version}</bundle>
         <bundle start-level="${earlyStartLevel}">mvn:commons-pool/commons-pool/${commonsPoolVersion}</bundle>
diff --git a/container/karaf/src/main/filtered-resources/etc/overrides.properties b/container/karaf/src/main/filtered-resources/etc/overrides.properties
index 23ea75e76d40..045bf6048ab7 100644
--- a/container/karaf/src/main/filtered-resources/etc/overrides.properties
+++ b/container/karaf/src/main/filtered-resources/etc/overrides.properties
@@ -83,6 +83,7 @@ mvn:io.netty/netty-transport/${netty4Version}
 mvn:io.netty/netty-handler/${netty4Version}
 mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
 mvn:io.netty/netty-transport-native-epoll/${netty4Version}
+mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
 mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
 mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
 mvn:io.netty/netty-codec/${netty4Version}
diff --git a/container/shared/src/main/filtered-resources/etc/overrides.properties b/container/shared/src/main/filtered-resources/etc/overrides.properties
index f50e1028b697..6c7f5616465c 100644
--- a/container/shared/src/main/filtered-resources/etc/overrides.properties
+++ b/container/shared/src/main/filtered-resources/etc/overrides.properties
@@ -80,5 +80,14 @@ mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2Version}
 mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2Version}
 mvn:com.fasterxml.jackson.core/jackson-core/${jackson2Version}
 
+mvn:io.netty/netty-resolver/${netty4Version}
 mvn:io.netty/netty-common/${netty4Version}
-mvn:io.netty/netty-transport/${netty4Version}
\ No newline at end of file
+mvn:io.netty/netty-buffer/${netty4Version}
+mvn:io.netty/netty-transport/${netty4Version}
+mvn:io.netty/netty-handler/${netty4Version}
+mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
+mvn:io.netty/netty-transport-native-epoll/${netty4Version}
+mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
+mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
+mvn:io.netty/netty-codec/${netty4Version}
+mvn:io.netty/netty-codec-http/${netty4Version}
\ No newline at end of file
diff --git a/dependencies/cassandra-test/pom.xml b/dependencies/cassandra-test/pom.xml
index 869695a51753..0fc8d565acda 100644
--- a/dependencies/cassandra-test/pom.xml
+++ b/dependencies/cassandra-test/pom.xml
@@ -86,4 +86,4 @@
       <version>${cassandraVersion}</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/dependencies/newts/pom.xml b/dependencies/newts/pom.xml
index c3465407bf16..7b630afe49f6 100644
--- a/dependencies/newts/pom.xml
+++ b/dependencies/newts/pom.xml
@@ -69,4 +69,4 @@
       <version>${jnrVersion}</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/features/amqp/alarm-northbounder/pom.xml b/features/amqp/alarm-northbounder/pom.xml
index 8b14a65a77dd..2dae6032cc94 100644
--- a/features/amqp/alarm-northbounder/pom.xml
+++ b/features/amqp/alarm-northbounder/pom.xml
@@ -173,8 +173,83 @@
           <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
         </exclusion>
+          <exclusion>
+              <groupId>org.apache.qpid</groupId>
+              <artifactId>qpid-jms-client</artifactId>
+          </exclusion>
       </exclusions>
     </dependency>
+      <dependency>
+          <groupId>org.apache.qpid</groupId>
+          <artifactId>qpid-jms-client</artifactId>
+          <version>0.30.0</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-buffer</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-common</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-handler</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-codec-http</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport-native-epoll</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport-native-kqueue</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-buffer</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-common</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-handler</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-codec-http</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-kqueue</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/features/amqp/event-forwarder/pom.xml b/features/amqp/event-forwarder/pom.xml
index 858b60c51d83..d820fe3a4a52 100644
--- a/features/amqp/event-forwarder/pom.xml
+++ b/features/amqp/event-forwarder/pom.xml
@@ -181,9 +181,84 @@
           <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
         </exclusion>
+          <exclusion>
+              <groupId>org.apache.qpid</groupId>
+              <artifactId>qpid-jms-client</artifactId>
+          </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
+      <dependency>
+          <groupId>org.apache.qpid</groupId>
+          <artifactId>qpid-jms-client</artifactId>
+          <version>0.30.0</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-buffer</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-common</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-handler</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-codec-http</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport-native-epoll</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>io.netty</groupId>
+                  <artifactId>netty-transport-native-kqueue</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-buffer</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-common</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-handler</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-codec-http</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+      <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-kqueue</artifactId>
+          <version>${netty4Version}</version>
+      </dependency>
+
+      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
diff --git a/features/amqp/event-receiver/pom.xml b/features/amqp/event-receiver/pom.xml
index 58408165f76f..5f4f19679325 100644
--- a/features/amqp/event-receiver/pom.xml
+++ b/features/amqp/event-receiver/pom.xml
@@ -180,8 +180,82 @@
           <groupId>com.sun.xml.bind</groupId>
           <artifactId>jaxb-impl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.qpid</groupId>
+          <artifactId>qpid-jms-client</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+        <artifactId>qpid-jms-client</artifactId>
+        <version>0.30.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
+          </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-kqueue</artifactId>
+      <version>${netty4Version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/features/minion/core/repository/src/assembly/repo.xml b/features/minion/core/repository/src/assembly/repo.xml
index c4614fcf4e30..b83118309663 100644
--- a/features/minion/core/repository/src/assembly/repo.xml
+++ b/features/minion/core/repository/src/assembly/repo.xml
@@ -13,6 +13,8 @@
       <excludes>
         <exclude>**/zookeeper/3.4.14</exclude>
         <exclude>**/zookeeper/3.4.14/*</exclude>
+        <exclude>io/netty/netty-*/4.1.77.Final</exclude>
+        <exclude>io/netty/netty-*/4.1.77.Final/*</exclude>
       </excludes>
     </fileSet>
   </fileSets>
diff --git a/features/minion/repository/src/assembly/repo.xml b/features/minion/repository/src/assembly/repo.xml
index d9bcda3acbff..6ea4740acb5f 100644
--- a/features/minion/repository/src/assembly/repo.xml
+++ b/features/minion/repository/src/assembly/repo.xml
@@ -17,6 +17,8 @@
         <exclude>**/zookeeper/3.4.14/*</exclude>
         <exclude>**/com/fasterxml/jackson/core/jackson-*/2.14.1</exclude>
         <exclude>**/com/fasterxml/jackson/core/jackson-*/2.14.1/*</exclude>
+        <exclude>io/netty/netty-*/4.1.77.Final</exclude>
+        <exclude>io/netty/netty-*/4.1.77.Final/*</exclude>
       </excludes>
     </fileSet>
   </fileSets>