diff --git a/.gitignore b/.gitignore
index 4d8b342d8d..a9ab7dc0df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ build.metadata
 *.tgz
 /**/nbproject/
 .ci/openshift-ci/build-root/scripts/InstallCert/jssecacerts
+private.pem
diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc
index 19cdf30bd6..9b4adef58d 100644
--- a/microprofile-fault-tolerance/README-source.adoc
+++ b/microprofile-fault-tolerance/README-source.adoc
@@ -84,8 +84,8 @@ Add the following properties to the `pom.xml`:
 
 [source,options="nowrap",subs="attributes+"]
 ----
-<version.microprofile.bom>{versionMicroprofileBom}</version.microprofile.bom>
-<version.server.bom>{versionServerBom}</version.server.bom>
+<version.bom.microprofile>{versionMicroprofileBom}</version.bom.microprofile>
+<version.bom.ee>{versionServerBom}</version.bom.ee>
 ----
 
 Also the project can be updated to use Java 8 as the minimum:
diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml
index 99854ce205..e6b11dbeda 100644
--- a/microprofile-health/pom.xml
+++ b/microprofile-health/pom.xml
@@ -172,7 +172,7 @@
                 <configuration>
                     <!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
                     <attributes>
-                        <versionMicroprofileBom>${version.microprofile.bom}</versionMicroprofileBom>
+                        <versionMicroprofileBom>${version.bom.microprofile}</versionMicroprofileBom>
                     </attributes>
                 </configuration>
             </plugin>
diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc
index fba604aa2a..1d6d702c2b 100644
--- a/microprofile-jwt/README-source.adoc
+++ b/microprofile-jwt/README-source.adoc
@@ -167,8 +167,8 @@ Add the following properties to the `pom.xml`.
 ----
 <version.com.nimbusds.jose.jwt>{versionComNimbusdsJoseJwt}</version.com.nimbusds.jose.jwt>
 <version.glassfish.json>{versionGlassfishJson}</version.glassfish.json>
-<version.microprofile.bom>{versionMicroprofileBom}</version.microprofile.bom>
-<version.server.bom>{versionServerBom}</version.server.bom>
+<version.bom.microprofile>{versionMicroprofileBom}</version.bom.microprofile>
+<version.bom.ee>{versionServerBom}</version.bom.ee>
 ----
 
 Also the project can be updated to use Java 11 as the minimum.
@@ -188,14 +188,14 @@ Before the dependencies are defined add the following boms.
     <dependency>
       <groupId>org.wildfly.bom</groupId>
       <artifactId>wildfly-ee-with-tools</artifactId>
-      <version>${version.server.bom}</version>
+      <version>${version.bom.ee}</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
     <dependency>
       <groupId>org.wildfly.bom</groupId>
       <artifactId>wildfly-microprofile</artifactId>
-      <version>${version.microprofile.bom}</version>
+      <version>${version.bom.microprofile}</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/microprofile-jwt/private.pem b/microprofile-jwt/private.pem
deleted file mode 100644
index 440c6cc341..0000000000
--- a/microprofile-jwt/private.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDKwJQPD4m4gn5f
-5tTJZcDKhLNx6FTXL1dvNuFeVR5W8oz9USMPCj80iv5Ss6DF6hC6YFi9fk38W9F9
-aqoLI/+CHrum6HMGw9ArLwLXOwb07Wr+4ah0pR4OYHurv0nR1OrkgJ4GX5CjhB3w
-+7vfi+gNdjt9AeVgkXJvpbzP5ZarhjFjLm3r0bvAq51o497entYAmOKcED3kvyfK
-mG8oWcf2YH8r5ptoB3Wd4ge8Sui1FP4YPH0SwXb3fjpPycG3CynwN77uy3+bS6fh
-SqdnrklsrmIXt2vpG+Ekr3zQ4oo6T0xK52wzOfiP03ItvMGGhVRBtpTUJ1FkeYot
-l+5fERr5AgMBAAECggEBAMixHR1XTQR1LvBwxbng3ZfZCOK8jZY+xzZPxX8hlBmO
-l157vM87Xlr9JkbohUDCsvI5Qj230yv0GwYg2daTOGwtTaQmPQ26L8k/DHnNdNJm
-W92VsrBbbMfgWyoi+8gXELdEVKeMWthwg06xb0MU8oq4uKPBh7Ix5mt7S80hviVi
-uM0y3YG0gDlrjBQPL/ONlht9KalTefHJoIuTxdWgJHUx9rfCfTXJSuz7mxwvIKbM
-NDwY2PyZFRv6rFfuFikjCujmTadFeNBCyCxpouD00oOfevlumwmPFiX/msz39dff
-/du10KkKz9Pvi9PfkZSojpp1MmVIyW5KBGgbVZEozTECgYEA77sAOlN1yMJCDB6L
-QWVfYdV709ZOVr2MxsFelLjIV540sUovMC2f61I//qJlbwwWx2zkmGfTzFMfzfco
-a3A0MU0AIMxAKR9qFVPaTEU/PE+mCVjGgn4Ev+hmC7iFcoRNXt24DjaECm5sZFKK
-ba2qOgLe9N56k/557RAg3KRfNg0CgYEA2IMhSlnmsnvq0IgEjRf1MJiB9LiYk4e1
-g1gkiKSze7JSkKfzJ24DGKovHXwOOKs+M9u9h5m56X6Td9DSHujKdhgrNFYkPpkZ
-4WMHYSZ31HJjEtNmelhlcfbod2Mij9tE4qBtztDxxLMH+RrfVtFYdJuOqpXLfpK5
-WOQeXJ/AiZ0CgYB1r9rLx18iQGNGKdR5NTffAnu4ohNxN7qddB5nalNH2C3L/zwt
-Lai9UHKEIdsj6c5g9o8+VnI+c2xAo54fKEUnEsMGVt8EkRx1/eVD3hbOF9fN7Nv/
-Abh5MbCu/lXcwyBsevI5X//wUwc5NOAqOcBAnFox4epRLvNSMsG/L55iHQKBgQCO
-4irsGFxI2cJjEACA5JipE1xgFhqK8fp1zYt+qcLRFSOr10p+cPmWI2moeaAhAdGx
-A4kWnfq0/xVu8t5YC6ThPp30kgylSwBrX6EVGf/msf50BBMTFpcMGLfdYg0DBt90
-+A6/d+C1wLi4SmWts8Y+XhJOvUBoLYgoA5ON6Nd1eQKBgAicumsO6WKeRf6CMMIq
-BXIz7IV36hKfEmZxLACrQSkKKuDzo+ZNQL70S4FF6GP4qQzmhfQtFjJ4kQg3W1cQ
-dWarq2s+K17ao47Q9tekEuawGxOq+64XaeVhvoJuub2P1QIOYn6jgQGoekMOQ2p1
-I6nvGl15CezAVt9Nv8gfeeYQ
------END PRIVATE KEY-----
diff --git a/microprofile-lra/README-source.adoc b/microprofile-lra/README-source.adoc
index a32da33411..14152966e3 100644
--- a/microprofile-lra/README-source.adoc
+++ b/microprofile-lra/README-source.adoc
@@ -194,7 +194,6 @@ The first thing to do is to change the minimum JDK to Java 11 and set the other
 <!-- The versions for the BOMs, Packs and Plugins -->
 <version.bom.ee>${version.server}</version.bom.ee>
 <version.bom.microprofile>${version.server}</version.bom.microprofile>
-<version.pack.cloud>{versionPackCloud}</version.pack.cloud>
 <version.plugin.wildfly>{versionPluginWildfly}</version.plugin.wildfly>
 <version.plugin.wildfly-jar>{versionPluginWildflyJar}</version.plugin.wildfly-jar>
 ----
diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml
index bca69d2e8d..28f4f63c7b 100644
--- a/microprofile-lra/pom.xml
+++ b/microprofile-lra/pom.xml
@@ -167,7 +167,6 @@
                     <!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
                     <attributes>
                         <versionServer>${version.server}</versionServer>
-                        <versionPackCloud>${version.pack.cloud}</versionPackCloud>
                         <versionPluginWildfly>${version.plugin.wildfly}</versionPluginWildfly>
                         <versionPluginWildflyJar>${version.plugin.wildfly-jar}</versionPluginWildflyJar>
                     </attributes>