diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
index 153f74108e94..cddf6274303f 100644
--- a/container/features/src/main/resources/features.xml
+++ b/container/features/src/main/resources/features.xml
@@ -8,11 +8,29 @@
     <repository>mvn:org.opennms.integration.api/karaf-features/${opennmsApiVersion}/xml</repository>
     <repository>mvn:com.eclipsesource.jaxrs/features/${osgiJaxRsVersion}/xml/features</repository>
     <repository>mvn:org.apache.karaf.features/enterprise/${karafVersion}/xml/features</repository>
-    <feature name="opennms-amqp-event-forwarder" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Event Forwarder">
+
+    <feature name="opennms-camel-amqp" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Camel Wrapper">
+        <!-- start this early so camel-amqp doesn't use its old version -->
+        <bundle start-level="60">mvn:io.netty/netty-common/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-buffer/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-transport/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-handler/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-codec/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-codec-http/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-transport-native-epoll/${netty4Version}</bundle>
+        <bundle start-level="60">mvn:io.netty/netty-transport-native-kqueue/${netty4Version}</bundle>
+
         <feature>camel-core</feature>
         <feature>camel-blueprint</feature>
         <feature>camel-http</feature>
         <feature>camel-amqp</feature>
+    </feature>
+
+    <feature name="opennms-amqp-event-forwarder" version="${project.version}" description="OpenNMS :: Features :: AMQP :: Event Forwarder">
+        <feature>camel-core</feature>
+        <feature>camel-blueprint</feature>
+        <feature>camel-http</feature>
+        <feature>opennms-camel-amqp</feature>
         <feature>guava</feature>
         <feature>opennms-core-camel</feature>
         <feature>opennms-dao-api</feature>
@@ -23,7 +41,7 @@
         <feature>camel-core</feature>
         <feature>camel-blueprint</feature>
         <feature>camel-http</feature>
-        <feature>camel-amqp</feature>
+        <feature>opennms-camel-amqp</feature>
         <feature>guava</feature>
         <feature>opennms-core-camel</feature>
         <feature>opennms-dao-api</feature>
@@ -34,7 +52,7 @@
         <feature>camel-core</feature>
         <feature>camel-blueprint</feature>
         <feature>camel-http</feature>
-        <feature>camel-amqp</feature>
+        <feature>opennms-camel-amqp</feature>
         <feature>opennms-core-camel</feature>
         <bundle>mvn:org.opennms.features.amqp/org.opennms.features.amqp.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.amqp/org.opennms.features.amqp.alarm-northbounder/${project.version}</bundle>
diff --git a/container/karaf/src/main/filtered-resources/etc/overrides.properties b/container/karaf/src/main/filtered-resources/etc/overrides.properties
index 7f764d6a0d8e..5871b9225272 100644
--- a/container/karaf/src/main/filtered-resources/etc/overrides.properties
+++ b/container/karaf/src/main/filtered-resources/etc/overrides.properties
@@ -9,9 +9,10 @@ mvn:io.netty/netty-common/${netty4Version}
 mvn:io.netty/netty-buffer/${netty4Version}
 mvn:io.netty/netty-transport/${netty4Version}
 mvn:io.netty/netty-handler/${netty4Version}
+mvn:io.netty/netty-transport/${netty4Version}
+mvn:io.netty/netty-codec/${netty4Version}
+mvn:io.netty/netty-codec-http/${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
+mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
\ No newline at end of file
diff --git a/container/shared/src/main/filtered-resources/etc/overrides.properties b/container/shared/src/main/filtered-resources/etc/overrides.properties
index 5aba2385e620..f645ebe74c39 100644
--- a/container/shared/src/main/filtered-resources/etc/overrides.properties
+++ b/container/shared/src/main/filtered-resources/etc/overrides.properties
@@ -31,3 +31,16 @@ mvn:org.eclipse.jetty.websocket/websocket-client/${jettyVersion};range=[9.4,10)
 mvn:org.eclipse.jetty.websocket/websocket-common/${jettyVersion};range=[9.4,10)
 mvn:org.eclipse.jetty.websocket/websocket-server/${jettyVersion};range=[9.4,10)
 mvn:org.eclipse.jetty.websocket/websocket-servlet/${jettyVersion};range=[9.4,10)
+
+mvn:io.netty/netty-resolver/${netty4Version}
+mvn:io.netty/netty-common/${netty4Version}
+mvn:io.netty/netty-buffer/${netty4Version}
+mvn:io.netty/netty-transport/${netty4Version}
+mvn:io.netty/netty-handler/${netty4Version}
+mvn:io.netty/netty-transport/${netty4Version}
+mvn:io.netty/netty-codec/${netty4Version}
+mvn:io.netty/netty-codec-http/${netty4Version}
+mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
+mvn:io.netty/netty-transport-native-epoll/${netty4Version}
+mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
+mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
\ No newline at end of file
diff --git a/features/amqp/alarm-northbounder/pom.xml b/features/amqp/alarm-northbounder/pom.xml
index f617d75da4d7..81bcb8642fb9 100644
--- a/features/amqp/alarm-northbounder/pom.xml
+++ b/features/amqp/alarm-northbounder/pom.xml
@@ -157,8 +157,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>
+      <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 62aa9a2aa6f3..b9c7cd1f9188 100644
--- a/features/amqp/event-forwarder/pom.xml
+++ b/features/amqp/event-forwarder/pom.xml
@@ -165,8 +165,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>
+      <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-receiver/pom.xml b/features/amqp/event-receiver/pom.xml
index 2efd4969eeef..35c892cf6b72 100644
--- a/features/amqp/event-receiver/pom.xml
+++ b/features/amqp/event-receiver/pom.xml
@@ -164,8 +164,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>
+      <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/opennms-full-assembly/src/assembly/components/osgi.xml b/opennms-full-assembly/src/assembly/components/osgi.xml
index 1f0b62c5a86e..b4ea0bfe3fc9 100644
--- a/opennms-full-assembly/src/assembly/components/osgi.xml
+++ b/opennms-full-assembly/src/assembly/components/osgi.xml
@@ -13,8 +13,6 @@
         <exclude>org/ops4j/pax/logging/pax-logging-log4j2/1.10.2/*</exclude>
         <exclude>io/netty/netty-codec-http/4.1.22.Final</exclude>
         <exclude>io/netty/netty-codec-http/4.1.22.Final/*</exclude>
-        <exclude>io/netty/netty-codec/4.1.22.Final</exclude>
-        <exclude>io/netty/netty-codec/4.1.22.Final/*</exclude>
       </excludes>
     </fileSet>