diff --git a/mail/pom.xml b/mail/pom.xml
index 7af5c089a5..c508cc1383 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -160,8 +160,7 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>core-tools</layer>
-                                <layer>core-server</layer>
+                                <layer>cloud-server</layer>
                                 <layer>mail</layer>
                                 <layer>jsf</layer>
                             </layers>
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
index 784a8b2f92..ee55cfc52b 100644
--- a/micrometer/pom.xml
+++ b/micrometer/pom.xml
@@ -138,7 +138,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>jaxrs-server</layer>
                                 <layer>micrometer</layer>
                             </layers>
@@ -181,7 +180,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>cloud-server</layer>
                                 <layer>micrometer</layer>
                             </layers>
@@ -223,7 +221,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>cloud-server</layer>
                                 <layer>micrometer</layer>
                             </layers>
diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
index 9e0b0041d7..716ce5ff67 100644
--- a/opentelemetry-tracing/pom.xml
+++ b/opentelemetry-tracing/pom.xml
@@ -138,7 +138,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>cloud-server</layer>
                                 <layer>opentelemetry</layer>
                             </layers>
@@ -179,7 +178,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>cloud-server</layer>
                                 <layer>opentelemetry</layer>
                             </layers>
@@ -221,7 +219,6 @@
                                 </feature-pack>
                             </feature-packs>
                             <layers>
-                                <layer>cdi</layer>
                                 <layer>cloud-server</layer>
                                 <layer>opentelemetry</layer>
                             </layers>