diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
index de07ee8..938cc04 100644
--- a/feature-pack/pom.xml
+++ b/feature-pack/pom.xml
@@ -124,12 +124,6 @@
 <!--            <version>${version.org.wildfly}</version>-->
 <!--            <type>zip</type>-->
 <!--        </dependency>-->
-        <dependency>
-            <groupId>org.wildfly.extras.reactive</groupId>
-            <artifactId>wildfly-microprofile-reactive-feature-pack</artifactId>
-            <version>${version.org.wildfly.reactive-feature-pack}</version>
-            <type>zip</type>
-        </dependency>
 
         <!-- Project modules -->
         <dependency>
diff --git a/feature-pack/src/main/resources/layers/standalone/microprofile-graphql/layer-spec.xml b/feature-pack/src/main/resources/layers/standalone/microprofile-graphql/layer-spec.xml
index 614690d..8d963d7 100644
--- a/feature-pack/src/main/resources/layers/standalone/microprofile-graphql/layer-spec.xml
+++ b/feature-pack/src/main/resources/layers/standalone/microprofile-graphql/layer-spec.xml
@@ -22,7 +22,6 @@
     <dependencies>
         <layer name="cdi"/>
         <layer name="microprofile-config"/>
-        <layer name="microprofile-context-propagation"/>
     </dependencies>
 
     <feature-group name="graphql"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/io/smallrye/graphql/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/io/smallrye/graphql/main/module.xml
index 7d3c718..efb7a2f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/io/smallrye/graphql/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/io/smallrye/graphql/main/module.xml
@@ -41,9 +41,6 @@
         <module name="org.eclipse.microprofile.config.api"/>
         <module name="org.eclipse.microprofile.graphql.api" export="true"/>
 
-        <!-- from the reactive feature pack -->
-        <module name="io.smallrye.context-propagation"/>
-        <module name="org.eclipse.microprofile.context-propagation.api"/>
         <module name="io.smallrye.reactive.mutiny" export="true"/>
         <module name="io.smallrye.reactive.mutiny.zero-flow-adapters" export="true"/>
         <module name="org.reactivestreams" export="true"/>
diff --git a/feature-pack/wildfly-feature-pack-build.xml b/feature-pack/wildfly-feature-pack-build.xml
index 984e80d..04abcc9 100644
--- a/feature-pack/wildfly-feature-pack-build.xml
+++ b/feature-pack/wildfly-feature-pack-build.xml
@@ -33,13 +33,6 @@
             </packages>
             <default-configs inherit="false"/>
         </dependency>
-        <dependency group-id="org.wildfly.extras.reactive" artifact-id="wildfly-microprofile-reactive-feature-pack">
-            <name>org.wildfly:wildfly-microprofile-reactive-feature-pack</name>
-            <packages inherit="false">
-                <include name="docs.examples"/>
-            </packages>
-            <default-configs inherit="false"/>
-        </dependency>
     </dependencies>
 
     <default-packages>
diff --git a/pom.xml b/pom.xml
index ddfafcd..5a014a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,6 @@
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
         <version.org.jboss.galleon>6.0.3.Final</version.org.jboss.galleon>
 
-        <!-- Other WildFly feature pack that we depend on -->
-        <version.org.wildfly.reactive-feature-pack>3.0.0.Final</version.org.wildfly.reactive-feature-pack> 
-
         <!-- Libraries provided by this feature pack. These variables directly affect what will be in
              the built feature pack. -->
         <version.io.smallrye.graphql>2.11.0</version.io.smallrye.graphql>
@@ -60,7 +57,7 @@
 
         <!-- Dependencies which are not included directly in the built feature pack but are dragged from WildFly,
              so they are here mostly just for compilation and testing purposes -->
-        <version.io.smallrye.reactive.mutiny>2.5.1</version.io.smallrye.reactive.mutiny>
+        <version.io.smallrye.reactive.mutiny>2.6.2</version.io.smallrye.reactive.mutiny>
         <version.io.smallrye.config>3.3.1</version.io.smallrye.config>
         <version.org.reactivestreams>1.0.4</version.org.reactivestreams>
         <version.elytron>2.1.0.Final</version.elytron>
@@ -71,6 +68,7 @@
         <version.kotlinx.metadata.jvm>0.7.0</version.kotlinx.metadata.jvm>
         <version.kotlin.stdlib>1.9.0</version.kotlin.stdlib>
 
+
         <!-- Testing-only dependencies -->
         <version.shrinkwrap>2.2.4</version.shrinkwrap>
         <version.commons-logging>1.1.3</version.commons-logging>
@@ -79,6 +77,9 @@
         <version.rest-assured>5.3.0</version.rest-assured>
         <version.arquillian-junit>1.7.0.Alpha12</version.arquillian-junit>
         <version.wildfly.glow>1.1.0.Final</version.wildfly.glow>
+        <!-- this is a dependency of Mutiny, and we need to bring it in separately to have it on
+         the test class path of @RunAsClient graphql-client tests -->
+        <version.jctools>4.0.5</version.jctools>
 
         <!-- Plugin versions and their dependency versions -->
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
diff --git a/testsuite/client-vertx/pom.xml b/testsuite/client-vertx/pom.xml
index ef94514..9b18b37 100644
--- a/testsuite/client-vertx/pom.xml
+++ b/testsuite/client-vertx/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>mutiny</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jctools</groupId>
+            <artifactId>jctools-core</artifactId>
+            <version>${version.jctools}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.graphql</groupId>
             <artifactId>microprofile-graphql-api</artifactId>