diff --git a/deps/cxf-rt-rs-mp-client-shade/pom.xml b/deps/cxf-rt-rs-mp-client-shade/pom.xml
index 1171910bf45..e28e814f50c 100644
--- a/deps/cxf-rt-rs-mp-client-shade/pom.xml
+++ b/deps/cxf-rt-rs-mp-client-shade/pom.xml
@@ -65,7 +65,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
     </dependency>
 
   </dependencies>
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index ecd57059cfa..8aca48bfae4 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: MicroProfile Config</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.config.version>3.0.1</microprofile.config.version>
+    <version.microprofile.config>3.0.2</version.microprofile.config>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
     <version.arquillian>1.7.0.Alpha10</version.arquillian>
   </properties>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
+      <version>${version.microprofile.config}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-custom-healthcheck/pom.xml b/examples/mp-custom-healthcheck/pom.xml
index 60436ff370c..0df77743657 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: Custom HealthCheck</name>
   <properties>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
-    <microprofile-health-api.version>4.0</microprofile-health-api.version>
+    <version.microprofile.health-api>4.0.1</version.microprofile.health-api>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
     <jakartaee-api.version>9.1-M2</jakartaee-api.version>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-api</artifactId>
-      <version>${microprofile-health-api.version}</version>
+      <version>${version.microprofile.health-api}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/examples/mp-faulttolerance-fallback/pom.xml b/examples/mp-faulttolerance-fallback/pom.xml
index c5cc8a8b880..abdbc0b1c8e 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -21,7 +21,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Fallback</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile-fault-tolerance-api.version}</version>
+      <version>${version.microprofile.fault-tolerance-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-faulttolerance-retry/pom.xml b/examples/mp-faulttolerance-retry/pom.xml
index fa77533b25e..fb8a8006d99 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Retry</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
diff --git a/examples/mp-faulttolerance-timeout/pom.xml b/examples/mp-faulttolerance-timeout/pom.xml
index 549ddd36113..e27844b079d 100644
--- a/examples/mp-faulttolerance-timeout/pom.xml
+++ b/examples/mp-faulttolerance-timeout/pom.xml
@@ -23,7 +23,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile Fault Tolerance :: Timeout</name>
   <properties>
-    <microprofile-fault-tolerance-api.version>1.0</microprofile-fault-tolerance-api.version>
+    <version.microprofile.fault-tolerance-api>4.0.2</version.microprofile.fault-tolerance-api>
     <arquillian-junit-container.version>1.7.0.Alpha10</arquillian-junit-container.version>
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-war-plugin.version>3.1.0</maven-war-plugin.version>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile-fault-tolerance-api.version}</version>
+      <version>${version.microprofile.fault-tolerance-api}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index c04abf5ed15..2622c33aaa6 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Counted</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <docker.image.name>tomee/${project.artifactId}</docker.image.name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index 0929e80b426..b5a7d36bfa3 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-histogram/pom.xml b/examples/mp-metrics-histogram/pom.xml
index 2e89abe4726..99b18c7a4cd 100644
--- a/examples/mp-metrics-histogram/pom.xml
+++ b/examples/mp-metrics-histogram/pom.xml
@@ -25,7 +25,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Histogram</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index f00eb0f77e9..c7dc08066c9 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index b794547746c..9c6f00981c6 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -24,7 +24,7 @@
   <name>TomEE :: Examples :: Microprofile Metrics Timed</name>
   <properties>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
-    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
     <tomee.version>10.0.0-SNAPSHOT</tomee.version>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/examples/mp-rest-client/README.adoc b/examples/mp-rest-client/README.adoc
index 0feea0cf4bc..b9404b1f77f 100644
--- a/examples/mp-rest-client/README.adoc
+++ b/examples/mp-rest-client/README.adoc
@@ -23,7 +23,7 @@ To use MicroProfile Rest Client you need 3 changes in your project:
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----
diff --git a/examples/mp-rest-client/README_es.adoc b/examples/mp-rest-client/README_es.adoc
index ed6008262a5..fb8291af5bc 100644
--- a/examples/mp-rest-client/README_es.adoc
+++ b/examples/mp-rest-client/README_es.adoc
@@ -22,7 +22,7 @@ Para utilizar el Cliente Rest de MicroProfile se requieren 3 cambios en su proye
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----
diff --git a/examples/mp-rest-client/README_pt.adoc b/examples/mp-rest-client/README_pt.adoc
index 1cf2256b3c6..725077b5422 100644
--- a/examples/mp-rest-client/README_pt.adoc
+++ b/examples/mp-rest-client/README_pt.adoc
@@ -22,7 +22,7 @@ Para usar o MicroProfile Rest Client, são necessárias 3 alterações no seu pr
  <dependency>
      <groupId>org.eclipse.microprofile.rest.client</groupId>
      <artifactId>microprofile-rest-client-api</artifactId>
-     <version>${microprofile.rest-client.version}</version>
+     <version>${version.microprofile.rest-client}</version>
      <scope>provided</scope>
  </dependency>
 ----
diff --git a/examples/mp-rest-client/pom.xml b/examples/mp-rest-client/pom.xml
index 775ba43d20b..5dd63638193 100755
--- a/examples/mp-rest-client/pom.xml
+++ b/examples/mp-rest-client/pom.xml
@@ -24,7 +24,7 @@
   <packaging>war</packaging>
   <name>TomEE :: Examples :: Microprofile REST Client</name>
   <properties>
-    <microprofile.rest-client.version>3.0</microprofile.rest-client.version>
+    <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
     <version.jakartaee-api>9.1-M2</version.jakartaee-api>
     <version.arquillian.bom>1.7.0.Alpha10</version.arquillian.bom>
     <junit.version>4.13.2</junit.version>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
+      <version>${version.microprofile.rest-client}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/itests/microprofile-jwt-itests/pom.xml b/itests/microprofile-jwt-itests/pom.xml
index 691dc97d79d..683dbcd7b0e 100644
--- a/itests/microprofile-jwt-itests/pom.xml
+++ b/itests/microprofile-jwt-itests/pom.xml
@@ -87,7 +87,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/itests/tomee-microprofile-itests/pom.xml b/itests/tomee-microprofile-itests/pom.xml
index 0448f5b8a1c..4839d3c2fde 100644
--- a/itests/tomee-microprofile-itests/pom.xml
+++ b/itests/tomee-microprofile-itests/pom.xml
@@ -86,13 +86,13 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>${microprofile.openapi.version}</version>
+      <version>${version.microprofile.openapi}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
+      <version>${version.microprofile.metrics}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index f67e000d8ef..7993d9ce2f9 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -34,13 +34,11 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-api</artifactId>
-      <version>${microprofile.jwt.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 05054b74c48..4f8b1a5e879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,36 +174,25 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Micro Profile API -->
-    <microprofile.version>5.0</microprofile.version>
-    <microprofile.config.version>3.0.2</microprofile.config.version>
-    <microprofile.config.tck.version>3.0.2</microprofile.config.tck.version>
-    <microprofile.fault-tolerance.version>4.0.2</microprofile.fault-tolerance.version>
-    <microprofile.fault-tolerance.tck.version>4.0.2</microprofile.fault-tolerance.tck.version>
-    <microprofile.health.version>4.0.1</microprofile.health.version>
-    <microprofile.health.tck.version>4.0.1</microprofile.health.tck.version>
-    <microprofile.jwt.version>2.0</microprofile.jwt.version>
-    <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
-    <microprofile.metrics.version>4.0.1</microprofile.metrics.version>
-    <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
-    <microprofile.openapi.version>3.0</microprofile.openapi.version>
-    <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
-    <microprofile.opentracing.version>3.0</microprofile.opentracing.version>
-    <microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
-    <microprofile.rest-client.version>3.0.1</microprofile.rest-client.version>
-    <microprofile.rest-client.tck.version>3.0.1</microprofile.rest-client.tck.version>
+    <version.microprofile>6.0</version.microprofile>
+    <version.microprofile.config>3.0.2</version.microprofile.config>
+    <version.microprofile.fault-tolerance>4.0.2</version.microprofile.fault-tolerance>
+    <version.microprofile.health>4.0.1</version.microprofile.health>
+    <version.microprofile.jwt>2.1</version.microprofile.jwt>
+    <version.microprofile.metrics>5.0.0</version.microprofile.metrics>
+    <version.microprofile.openapi>3.1</version.microprofile.openapi>
+    <version.microprofile.opentracing>3.0</version.microprofile.opentracing>
+    <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
 
-    <opentracing.api>0.33.0</opentracing.api>
+    <version.io.opentracing>0.33.0</version.io.opentracing>
 
     <!-- Micro Profile Impl. -->
-    <microprofile.config.impl.version>3.0.0</microprofile.config.impl.version>
-    <microprofile.fault-tolerance.impl.version>6.0.0</microprofile.fault-tolerance.impl.version>
-    <microprofile.health.impl.version>4.0.0</microprofile.health.impl.version>
-    <microprofile.metrics.impl.version>4.0.0</microprofile.metrics.impl.version>
-    <microprofile.openapi.impl.version>3.0.0</microprofile.openapi.impl.version>
-    <microprofile.opentracing.impl.version>3.0.0</microprofile.opentracing.impl.version>
-
-    <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
-    <microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
+    <version.microprofile.impl.config>3.1.1</version.microprofile.impl.config>
+    <version.microprofile.impl.fault-tolerance>6.1.0</version.microprofile.impl.fault-tolerance>
+    <version.microprofile.impl.health>4.0.1</version.microprofile.impl.health>
+    <version.microprofile.impl.metrics>4.0.0</version.microprofile.impl.metrics>
+    <version.microprofile.impl.openapi>3.1.2</version.microprofile.impl.openapi>
+    <version.microprofile.impl.opentracing>3.0.0</version.microprofile.impl.opentracing>
 
     <!-- Jackson and snakeyaml required by OpenAPI Impl -->
     <version.jackson>2.14.1</version.jackson>
@@ -239,6 +228,7 @@
     <version.hibernate.orm>6.1.4.Final</version.hibernate.orm>
     <version.hibernate.validator>7.0.5.Final</version.hibernate.validator>
 
+    <!-- Other API and Impl. not in Jakarta EE -->
     <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
     <version.krazo>2.0.2</version.krazo>
     <version.deltaspike>1.9.6</version.deltaspike>
@@ -1058,6 +1048,61 @@
   </pluginRepositories>
   <dependencyManagement>
     <dependencies>
+      <!-- Micro Profile API -->
+      <dependency>
+        <groupId>org.eclipse.microprofile.config</groupId>
+        <artifactId>microprofile-config-api</artifactId>
+        <version>${version.microprofile.config}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+        <artifactId>microprofile-fault-tolerance-api</artifactId>
+        <version>${version.microprofile.fault-tolerance}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.health</groupId>
+        <artifactId>microprofile-health-api</artifactId>
+        <version>${version.microprofile.health}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-api</artifactId>
+        <version>${version.microprofile.jwt}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-api</artifactId>
+        <version>${version.microprofile.metrics}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.openapi</groupId>
+        <artifactId>microprofile-openapi-api</artifactId>
+        <version>${version.microprofile.openapi}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.opentracing</groupId>
+        <artifactId>microprofile-opentracing-api</artifactId>
+        <version>${version.microprofile.opentracing}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.rest.client</groupId>
+        <artifactId>microprofile-rest-client-api</artifactId>
+        <version>${version.microprofile.rest-client}</version>
+      </dependency>
+      <!-- Open Tracing API -->
+      <dependency>
+        <groupId>io.opentracing</groupId>
+        <artifactId>opentracing-api</artifactId>
+        <version>${version.io.opentracing}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.opentracing</groupId>
+        <artifactId>opentracing-mock</artifactId>
+        <version>${version.io.opentracing}</version>
+      </dependency>
+      <!-- Following dependencies remain to be cleaned up -->
+
+
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>jakartaee-api</artifactId>
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index aa327e273a2..e9988a5b651 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -116,14 +116,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-tck</artifactId>
-      <version>${microprofile.config.tck.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index c8b7bc0ac96..a2282a9cfbe 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -97,13 +97,11 @@
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-api</artifactId>
-      <version>${microprofile.fault-tolerance.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
       <artifactId>microprofile-fault-tolerance-tck</artifactId>
-      <version>${microprofile.fault-tolerance.tck.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 37d2dcce3e5..39b8bb0aaf7 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -84,7 +84,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-api</artifactId>
-      <version>${microprofile.health.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.inject</groupId>
@@ -96,7 +95,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.health</groupId>
       <artifactId>microprofile-health-tck</artifactId>
-      <version>${microprofile.health.tck.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 3ab9892a6e1..2b9711bdef4 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -96,7 +96,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-tck</artifactId>
-      <version>${microprofile.jwt.tck.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -110,7 +109,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.jwt</groupId>
       <artifactId>microprofile-jwt-auth-tck</artifactId>
-      <version>${microprofile.jwt.tck.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -138,7 +136,7 @@
     <dependency>
       <groupId>io.smallrye.config</groupId>
       <artifactId>smallrye-config-core</artifactId>
-      <version>${microprofile.config.impl.version}</version>
+      <version>${version.microprofile.impl.config}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index bcfdc81af99..7c0c06490e1 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -100,14 +100,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api</artifactId>
-      <version>${microprofile.metrics.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-api-tck</artifactId>
-      <version>${microprofile.metrics.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.arquillian.container</groupId>
@@ -120,7 +118,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.metrics</groupId>
       <artifactId>microprofile-metrics-rest-tck</artifactId>
-      <version>${microprofile.metrics.tck.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 35093fbd7c1..c003726cdda 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -88,14 +88,12 @@
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-api</artifactId>
-      <version>${microprofile.openapi.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.openapi</groupId>
       <artifactId>microprofile-openapi-tck</artifactId>
-      <version>${microprofile.openapi.tck.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index 09458122df6..961711f31d7 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -84,27 +84,23 @@
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
       <artifactId>microprofile-config-api</artifactId>
-      <version>${microprofile.config.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-api</artifactId>
-      <version>${microprofile.opentracing.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-tck</artifactId>
-      <version>${microprofile.opentracing.tck.version}</version>
       <scope>test</scope>
     </dependency>
     <!--
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>
       <artifactId>microprofile-opentracing-tck-rest-client</artifactId>
-      <version>${microprofile.opentracing.tck.version}</version>
       <scope>test</scope>
     </dependency>
     -->
@@ -181,21 +177,19 @@
     <dependency>
       <groupId>io.opentracing</groupId>
       <artifactId>opentracing-mock</artifactId>
-      <version>${opentracing.api}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.opentracing</groupId>
       <artifactId>opentracing-api</artifactId>
-      <version>${opentracing.api}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-opentracing</artifactId>
-      <version>${microprofile.opentracing.impl.version}</version>
+      <version>${version.microprofile.impl.opentracing}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 26216169ffc..b9325d688dc 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -39,4 +39,72 @@
     <module>fault-tolerance</module>
     <module>opentracing</module>
   </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Micro Profile TCK -->
+      <dependency>
+        <groupId>org.eclipse.microprofile.config</groupId>
+        <artifactId>microprofile-config-tck</artifactId>
+        <version>${version.microprofile.config}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+        <artifactId>microprofile-fault-tolerance-tck</artifactId>
+        <version>${version.microprofile.fault-tolerance}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.health</groupId>
+        <artifactId>microprofile-health-tck</artifactId>
+        <version>${version.microprofile.health}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-tck</artifactId>
+        <version>${version.microprofile.jwt}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.jwt</groupId>
+        <artifactId>microprofile-jwt-auth-tck</artifactId>
+        <version>${version.microprofile.jwt}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-api-tck</artifactId>
+        <version>${version.microprofile.metrics}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.metrics</groupId>
+        <artifactId>microprofile-metrics-rest-tck</artifactId>
+        <version>${version.microprofile.metrics}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.openapi</groupId>
+        <artifactId>microprofile-openapi-tck</artifactId>
+        <version>${version.microprofile.openapi}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.opentracing</groupId>
+        <artifactId>microprofile-opentracing-tck</artifactId>
+        <version>${version.microprofile.opentracing}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.microprofile.rest.client</groupId>
+        <artifactId>microprofile-rest-client-tck</artifactId>
+        <version>${version.microprofile.rest-client}</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
 </project>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index c1713d1e342..de726e4e025 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -125,7 +125,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-api</artifactId>
-      <version>${microprofile.rest-client.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -138,7 +137,6 @@
     <dependency>
       <groupId>org.eclipse.microprofile.rest.client</groupId>
       <artifactId>microprofile-rest-client-tck</artifactId>
-      <version>${microprofile.rest-client.tck.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
index 60c997d386b..8d6f4484fad 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -29,129 +29,84 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- MicroProfile API -->
-      <dependency>
-        <groupId>org.eclipse.microprofile</groupId>
-        <artifactId>microprofile</artifactId>
-        <version>${microprofile.version}</version>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.config</groupId>
-        <artifactId>microprofile-config-api</artifactId>
-        <version>${microprofile.config.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
-        <artifactId>microprofile-fault-tolerance-api</artifactId>
-        <version>${microprofile.fault-tolerance.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.health</groupId>
-        <artifactId>microprofile-health-api</artifactId>
-        <version>${microprofile.health.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.jwt</groupId>
-        <artifactId>microprofile-jwt-auth-api</artifactId>
-        <version>${microprofile.jwt.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.metrics</groupId>
-        <artifactId>microprofile-metrics-api</artifactId>
-        <version>${microprofile.metrics.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.openapi</groupId>
-        <artifactId>microprofile-openapi-api</artifactId>
-        <version>${microprofile.openapi.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.opentracing</groupId>
-        <artifactId>microprofile-opentracing-api</artifactId>
-        <version>${microprofile.opentracing.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.microprofile.rest.client</groupId>
-        <artifactId>microprofile-rest-client-api</artifactId>
-        <version>${microprofile.rest-client.version}</version>
-      </dependency>
-      <!-- SmallRye API & Impl -->
+      <!-- SmallRye API & Impl. -->
       <dependency>
         <groupId>io.smallrye.config</groupId>
         <artifactId>smallrye-config</artifactId>
-        <version>${microprofile.config.impl.version}</version>
+        <version>${version.microprofile.impl.config}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-fault-tolerance-api</artifactId>
-        <version>${microprofile.fault-tolerance.impl.version}</version>
+        <version>${version.microprofile.impl.fault-tolerance}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-fault-tolerance</artifactId>
-        <version>${microprofile.fault-tolerance.impl.version}</version>
+        <version>${version.microprofile.impl.fault-tolerance}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
-        <version>${microprofile.fault-tolerance.impl.version}</version>
+        <version>${version.microprofile.impl.fault-tolerance}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-fault-tolerance-core</artifactId>
-        <version>${microprofile.fault-tolerance.impl.version}</version>
+        <version>${version.microprofile.impl.fault-tolerance}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-health-api</artifactId>
-        <version>${microprofile.health.impl.version}</version>
+        <version>${version.microprofile.impl.health}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-health</artifactId>
-        <version>${microprofile.health.impl.version}</version>
+        <version>${version.microprofile.impl.health}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-metrics-api</artifactId>
-        <version>${microprofile.metrics.impl.version}</version>
+        <version>${version.microprofile.impl.metrics}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-metrics</artifactId>
-        <version>${microprofile.metrics.impl.version}</version>
+        <version>${version.microprofile.impl.metrics}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-open-api</artifactId>
-        <version>${microprofile.openapi.impl.version}</version>
+        <version>${version.microprofile.impl.openapi}</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-open-api-core</artifactId>
-        <version>${microprofile.openapi.impl.version}</version>
+        <version>${version.microprofile.impl.openapi}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-open-api-jaxrs</artifactId>
-        <version>${microprofile.openapi.impl.version}</version>
+        <version>${version.microprofile.impl.openapi}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-opentracing</artifactId>
-        <version>${microprofile.opentracing.impl.version}</version>
+        <version>${version.microprofile.impl.opentracing}</version>
       </dependency>
       <dependency>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-opentracing-contrib</artifactId>
-         <version>${microprofile.opentracing.impl.version}</version>
+         <version>${version.microprofile.impl.opentracing}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
 
+    <!-- provided dependencies -->
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jakartaee-api</artifactId>
@@ -166,8 +121,8 @@
     </dependency>
 
     <dependency>
-      <artifactId>openejb-rest</artifactId>
       <groupId>org.apache.tomee</groupId>
+      <artifactId>openejb-rest</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -178,7 +133,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- MicroProfile -->
+    <!-- Micro Profile API -->
 
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
@@ -186,23 +141,18 @@
     </dependency>
 
     <dependency>
-      <groupId>io.smallrye.config</groupId>
-      <artifactId>smallrye-config</artifactId>
+      <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+      <artifactId>microprofile-fault-tolerance-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.microprofile.health</groupId>
+      <artifactId>microprofile-health-api</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>*</groupId>
-          <artifactId>microprofile-config-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jakarta.enterprise</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <!--
-        <exclusion>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
+          <groupId>javax.inject</groupId>
+          <artifactId>javax.inject</artifactId>
         </exclusion>
-        -->
       </exclusions>
     </dependency>
 
@@ -212,40 +162,67 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mp-jwt</artifactId>
-      <version>${microprofile.jwt.impl.version}</version>
+      <groupId>org.eclipse.microprofile.metrics</groupId>
+      <artifactId>microprofile-metrics-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.microprofile.openapi</groupId>
+      <artifactId>microprofile-openapi-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.microprofile.opentracing</groupId>
+      <artifactId>microprofile-opentracing-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.microprofile.rest.client</groupId>
+      <artifactId>microprofile-rest-client-api</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>*</groupId>
-          <artifactId>microprofile-jwt-auth-api</artifactId>
+          <groupId>javax.inject</groupId>
+          <artifactId>javax.inject</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
+    <!-- Open Tracing API -->
     <dependency>
-      <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
-      <artifactId>microprofile-fault-tolerance-api</artifactId>
+      <groupId>io.opentracing</groupId>
+      <artifactId>opentracing-api</artifactId>
     </dependency>
 
+    <!-- SmallRye Impl. -->
+
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-fault-tolerance</artifactId>
+      <groupId>io.smallrye.config</groupId>
+      <artifactId>smallrye-config</artifactId>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
-          <artifactId>microprofile-fault-tolerance-api</artifactId>
+          <artifactId>microprofile-config-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>jakarta.enterprise</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <!--
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+        -->
       </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.health</groupId>
-      <artifactId>microprofile-health-api</artifactId>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-fault-tolerance</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.inject</groupId>
-          <artifactId>javax.inject</artifactId>
+          <groupId>*</groupId>
+          <artifactId>microprofile-fault-tolerance-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -261,11 +238,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.microprofile.metrics</groupId>
-      <artifactId>microprofile-metrics-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.smallrye</groupId>
       <artifactId>smallrye-metrics</artifactId>
@@ -278,47 +250,29 @@
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.microprofile.rest.client</groupId>
-      <artifactId>microprofile-rest-client-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.inject</groupId>
-          <artifactId>javax.inject</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomee</groupId>
-      <artifactId>cxf-rt-rs-mp-client-shade</artifactId>
-      <version>${project.version}</version>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-open-api</artifactId>
+      <type>pom</type>
       <exclusions>
-        <!-- exclude in favor of cxf-shade -->
         <exclusion>
-          <groupId>org.apache.cxf</groupId>
-          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+          <artifactId>microprofile-openapi-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.microprofile.openapi</groupId>
-      <artifactId>microprofile-openapi-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-open-api</artifactId>
-      <type>pom</type>
+      <artifactId>smallrye-opentracing</artifactId>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
-          <artifactId>microprofile-openapi-api</artifactId>
+          <artifactId>microprofile-opentracing-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
-    <!-- Jackson required by OpenAPI Impl -->
+    <!-- Jackson and snakeyaml required by OpenAPI Impl -->
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
@@ -327,32 +281,36 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <!-- Jackson Dataformat Yaml requires snakeyaml -->
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.microprofile.opentracing</groupId>
-      <artifactId>microprofile-opentracing-api</artifactId>
-    </dependency>
+    <!-- Other Micro Profile Impl. -->
 
     <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-opentracing</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mp-jwt</artifactId>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
-          <artifactId>microprofile-opentracing-api</artifactId>
+          <artifactId>microprofile-jwt-auth-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-api</artifactId>
-      <version>${opentracing.api}</version>
+      <groupId>org.apache.tomee</groupId>
+      <artifactId>cxf-rt-rs-mp-client-shade</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <!-- exclude in favor of cxf-shade -->
+        <exclusion>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>