diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index bbb0d1d..8dcb086 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,7 @@
+## 3.0-M3
+
+* #6 Upgrade CXF 3.x to 3.5.8
+
 ## 2.0.B1
 
 * #4 Switch from javax.xml.ws to jakarta.xml.ws
diff --git a/bootique-cxf-core/pom.xml b/bootique-cxf-core/pom.xml
index 4000538..a779eaa 100644
--- a/bootique-cxf-core/pom.xml
+++ b/bootique-cxf-core/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>javax.jws-api</artifactId>
             <version>1.1</version>
         </dependency>
+        <!-- Java 9+ implicit deps -->
+        <dependency>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+        </dependency>
 
         <!-- Unit test dependencies -->
         <dependency>
diff --git a/bootique-cxf-jaxws-client/pom.xml b/bootique-cxf-jaxws-client/pom.xml
index 7ec1713..c97294e 100644
--- a/bootique-cxf-jaxws-client/pom.xml
+++ b/bootique-cxf-jaxws-client/pom.xml
@@ -26,11 +26,6 @@
                 <artifactId>cxf-rt-transports-http</artifactId>
                 <version>${cxf.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.xml.ws</groupId>
-                <artifactId>jakarta.xml.ws-api</artifactId>
-                <version>${jaxws-api.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -64,13 +59,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!-- Java 9+ implicit deps -->
-
-        <dependency>
-            <groupId>jakarta.xml.ws</groupId>
-            <artifactId>jakarta.xml.ws-api</artifactId>
-        </dependency>
-
         <!-- Unit test dependencies -->
         <dependency>
             <groupId>io.bootique</groupId>
diff --git a/bootique-cxf-jaxws-it/pom.xml b/bootique-cxf-jaxws-it/pom.xml
index d9a2eef..95204e6 100644
--- a/bootique-cxf-jaxws-it/pom.xml
+++ b/bootique-cxf-jaxws-it/pom.xml
@@ -41,12 +41,6 @@
         </dependency>
 
         <!-- Java 9+ implicit deps -->
-
-        <dependency>
-            <groupId>jakarta.xml.ws</groupId>
-            <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>${jaxws-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-ri</artifactId>
diff --git a/bootique-cxf-jaxws-server/pom.xml b/bootique-cxf-jaxws-server/pom.xml
index 2ecab77..1ddbb21 100644
--- a/bootique-cxf-jaxws-server/pom.xml
+++ b/bootique-cxf-jaxws-server/pom.xml
@@ -35,11 +35,6 @@
                 <artifactId>cxf-rt-transports-http</artifactId>
                 <version>${cxf.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.xml.ws</groupId>
-                <artifactId>jakarta.xml.ws-api</artifactId>
-                <version>${jaxws-api.version}</version>
-            </dependency>
 
         </dependencies>
     </dependencyManagement>
@@ -79,10 +74,6 @@
         </dependency>
 
         <!-- Java 9+ implicit deps -->
-        <dependency>
-            <groupId>jakarta.xml.ws</groupId>
-            <artifactId>jakarta.xml.ws-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-ri</artifactId>
diff --git a/pom.xml b/pom.xml
index a01d70d..161d0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 
     <properties>
         <bootique.version>${project.version}</bootique.version>
-        <cxf.version>3.3.1</cxf.version>
+        <cxf.version>3.5.8</cxf.version>
         <apache.hc.version>4.5.5</apache.hc.version>
         <jaxws-api.version>2.3.3</jaxws-api.version>
         <jaxws-ri.version>2.3.3</jaxws-ri.version>
@@ -91,6 +91,11 @@
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.xml.ws</groupId>
+                <artifactId>jakarta.xml.ws-api</artifactId>
+                <version>${jaxws-api.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>