diff --git a/core/pom.xml b/core/pom.xml
index 6e4f02cc..7f8521a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -76,53 +76,31 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!--
-                The intersmash-core POM must be published because is transitively pulled in by the build
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
-            <id>doc</id>
+            <id>jboss-release</id>
             <build>
                 <plugins>
-                    <!-- Generate sources and Javadoc artifacts -->
+                    <!--
+                        The intersmash-core POM must be published because is transitively pulled in by the build
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-assembly-plugin</artifactId>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>publish</id>
+            <id>gpg-sign</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
index bbd2acd2..84d514a1 100644
--- a/kubernetes-client/pom.xml
+++ b/kubernetes-client/pom.xml
@@ -78,4 +78,37 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+        <id>jboss-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>gpg-sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6bd882a9..0454cb6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,11 +515,6 @@
                         </ignoredUnusedDeclaredDependencies>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${version.maven-deploy-plugin}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -585,11 +580,6 @@
                     <artifactId>java-generator-maven-plugin</artifactId>
                     <version>${version.io.fabric8}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${version.maven-assembly-plugin}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
@@ -687,14 +677,6 @@
                     </java>
                 </configuration>
             </plugin>
-            <!--
-                The intersmash-parent POM must be published because there are projects which could use it, even as a
-                transitive dependency
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -745,56 +727,74 @@
         <profile>
             <id>jboss-release</id>
             <build>
+                <pluginManagement>
+                    <plugins>
+                        <!-- Create a source-release artifact that contains the fully buildable
+                                 project directory source structure.  This should be released to
+                                 the Maven repository for each JBoss project release. -->
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-assembly-plugin</artifactId>
+                            <version>${version.maven-assembly-plugin}</version>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.apache.apache.resources</groupId>
+                                    <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                    <version>1.5</version>
+                                </dependency>
+                            </dependencies>
+                            <executions>
+                                <execution>
+                                    <id>source-release-assembly</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>single</goal>
+                                    </goals>
+                                    <configuration>
+                                        <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                        <descriptorRefs>
+                                            <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                        </descriptorRefs>
+                                        <tarLongFileMode>gnu</tarLongFileMode>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-deploy-plugin</artifactId>
+                            <version>${version.maven-deploy-plugin}</version>
+                            <configuration>
+                                <altReleaseDeploymentRepository>${jboss.releases.repo.id}::${jboss.releases.repo.url}</altReleaseDeploymentRepository>
+                                <altSnapshotDeploymentRepository>${jboss.snapshots.repo.id}::${jboss.snapshots.repo.url}</altSnapshotDeploymentRepository>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <version>${version.maven-javadoc-plugin}</version>
+                            <configuration>
+                                <doclint>none</doclint>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>attach-javadocs</id>
+                                    <goals>
+                                        <goal>jar</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
                 <plugins>
-                    <!-- Create a source-release artifact that contains the fully buildable
-                             project directory source structure.  This should be released to
-                             the Maven repository for each JBoss project release. -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.5</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>source-release-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                    <descriptorRefs>
-                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-                                    </descriptorRefs>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
+                    <!--
+                        The intersmash-parent POM must be published because there are projects which could use it, even as a
+                        transitive dependency
+                    -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <altReleaseDeploymentRepository>${jboss.releases.repo.id}::${jboss.releases.repo.url}</altReleaseDeploymentRepository>
-                            <altSnapshotDeploymentRepository>${jboss.snapshots.repo.id}::${jboss.snapshots.repo.url}</altSnapshotDeploymentRepository>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/provisioners/pom.xml b/provisioners/pom.xml
index 89c78cfb..4eada22c 100644
--- a/provisioners/pom.xml
+++ b/provisioners/pom.xml
@@ -331,54 +331,31 @@
 
                 </executions>
             </plugin>
-            <!--
-                The intersmash-provisioners POM must be published because is transitively pulled in by the build
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
-            <id>doc</id>
+            <id>jboss-release</id>
             <build>
                 <plugins>
-                    <!-- Generate sources and Javadoc artifacts -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <doclint>none</doclint>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
         <profile>
-            <id>publish</id>
+            <id>gpg-sign</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/testsuite/deployments/deployments-provider/pom.xml b/testsuite/deployments/deployments-provider/pom.xml
index 0cf8d2c0..d3027fda 100644
--- a/testsuite/deployments/deployments-provider/pom.xml
+++ b/testsuite/deployments/deployments-provider/pom.xml
@@ -34,10 +34,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
@@ -142,12 +138,16 @@
             </properties>
         </profile>
         <profile>
-            <id>doc</id>
+            <id>jboss-release</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -157,7 +157,7 @@
             </build>
         </profile>
         <profile>
-            <id>publish</id>
+            <id>gpg-sign</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/testsuite/deployments/pom.xml b/testsuite/deployments/pom.xml
index 480010a7..e9e04217 100644
--- a/testsuite/deployments/pom.xml
+++ b/testsuite/deployments/pom.xml
@@ -59,16 +59,26 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
-            <id>publish</id>
+            <id>jboss-release</id>
+            <build>
+                <plugins>
+                    <!--
+                        The test-deployments POM must be published because is transitively pulled in by the build
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>gpg-sign</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 730822f4..95cd23e3 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -35,21 +35,23 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <plugins>
-            <!--
-                The intersmash-testsuite POM must be published because is transitively pulled in by the build
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
-            <id>publish</id>
+            <id>jboss-release</id>
+            <build>
+                <plugins>
+                    <!--
+                        The intersmash-testsuite POM must be published because is transitively pulled in by the build
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>gpg-sign</id>
             <build>
                 <plugins>
                     <plugin>