diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
index 1c353b70c4..4f5a23cda9 100644
--- a/helloworld-ws/pom.xml
+++ b/helloworld-ws/pom.xml
@@ -49,6 +49,7 @@
         <version.server>35.0.0.Beta1</version.server>
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
+        <version.pack.cloud>7.0.2.Final</version.pack.cloud>
         <version.plugin.wildfly>5.1.0.Beta2</version.plugin.wildfly>
     </properties>
 
diff --git a/mail/pom.xml b/mail/pom.xml
index 0754f25642..65741a3e95 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 20b9b2623a..be2352c8cf 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 96f2a2ca6d..4c952fcca3 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>