diff --git a/ee-feature-pack/channel/pom.xml b/ee-feature-pack/channel/pom.xml
index fdf8636cfdaa..4dad39b8ac32 100644
--- a/ee-feature-pack/channel/pom.xml
+++ b/ee-feature-pack/channel/pom.xml
@@ -11,16 +11,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
         <groupId>org.wildfly</groupId>
-        <artifactId>wildfly-ee-feature-pack-parent</artifactId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wildfly-ee-channel</artifactId>
+    <groupId>org.wildfly.channels</groupId>
+    <artifactId>wildfly-ee</artifactId>
 
     <name>WildFly: EE Feature Pack Channel</name>
     <packaging>pom</packaging>
@@ -29,12 +35,12 @@
 
         <!-- We need the feature pack built first as that generates the manifest -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ee-galleon-pack</artifactId>
-            <type>zip</type>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -44,7 +50,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
                     <!-- This module's artifacts are currently not deployed -->
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
             </plugin>
             <!-- Use the assembly plugin to copy and rename the manifest generated by the feature pack build.
@@ -61,7 +67,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>../channel/assembly.xml</descriptor>
+                                <descriptor>${project.basedir}/assembly.xml</descriptor>
                             </descriptors>
                             <finalName>assembly</finalName>
                             <workDirectory>${project.build.directory}/assembly-src/work</workDirectory>
@@ -137,6 +143,26 @@
                     </execution>-->
                 </executions>
             </plugin>
+            <!-- change the manifest metadata -->
+            <plugin>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-channel-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>edit-manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
+                    <manifestName>WildFly EE manifest version ${project.version}</manifestName>
+                    <manifestId>${project.groupId}:${project.artifactId}</manifestId>
+                    <manifestDescription>Manifest for WildFly EE feature pack.</manifestDescription>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ee-feature-pack/channel/src/main/resources/wildfly-ee-channel.yaml b/ee-feature-pack/channel/src/main/resources/wildfly-ee-channel.yaml
deleted file mode 100644
index 407da4db10fd..000000000000
--- a/ee-feature-pack/channel/src/main/resources/wildfly-ee-channel.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-schemaVersion: "2.0.0"
-repositories:
-  - id: "central"
-    url: "https://repo1.maven.org/maven2/"
-  - id: "jboss-public"
-    url: "https://repository.jboss.org/nexus/content/groups/public/"
-manifest:
-  maven:
-    groupId: ${project.groupId}
-    artifactId: ${project.artifactId}
-    version: ${project.version}
\ No newline at end of file
diff --git a/galleon-pack/channel/pom.xml b/galleon-pack/channel/pom.xml
index 87364b5b99c6..c3100c93fa24 100644
--- a/galleon-pack/channel/pom.xml
+++ b/galleon-pack/channel/pom.xml
@@ -11,16 +11,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
         <groupId>org.wildfly</groupId>
-        <artifactId>wildfly-feature-pack-parent</artifactId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wildfly-channel</artifactId>
+    <groupId>org.wildfly.channels</groupId>
+    <artifactId>wildfly</artifactId>
 
     <name>WildFly: Feature Pack Channel</name>
     <packaging>pom</packaging>
@@ -29,12 +35,12 @@
 
         <!-- We need the feature pack built first as that generates the manifest -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.wildfly</groupId>
             <artifactId>wildfly-galleon-pack</artifactId>
-            <type>zip</type>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -44,7 +50,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
                     <!-- This module's artifacts are currently not deployed -->
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
             </plugin>
             <!-- Use the assembly plugin to copy and rename the manifest generated by the feature pack build.
@@ -61,7 +67,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>../channel/assembly.xml</descriptor>
+                              <descriptor>${project.basedir}/assembly.xml</descriptor>
                             </descriptors>
                             <finalName>assembly</finalName>
                             <workDirectory>${project.build.directory}/assembly-src/work</workDirectory>
@@ -137,6 +143,34 @@
                     </execution>-->
                 </executions>
             </plugin>
+            <!-- change the manifest metadata -->
+            <plugin>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-channel-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>edit-manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
+                    <manifestName>WildFly manifest version ${project.version}</manifestName>
+                    <manifestId>${project.groupId}:${project.artifactId}</manifestId>
+                    <manifestDescription>Manifest for WildFly feature pack.</manifestDescription>
+                    <manifestRequirements>
+                        <manifestRequirement>
+                            <id>${project.groupId}:wildfly-ee</id>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>wildfly-ee</artifactId>
+                            <version>${project.version}</version>
+                        </manifestRequirement>
+                    </manifestRequirements>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/galleon-pack/channel/src/main/resources/wildfly-channel.yaml b/galleon-pack/channel/src/main/resources/wildfly-channel.yaml
deleted file mode 100644
index 407da4db10fd..000000000000
--- a/galleon-pack/channel/src/main/resources/wildfly-channel.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-schemaVersion: "2.0.0"
-repositories:
-  - id: "central"
-    url: "https://repo1.maven.org/maven2/"
-  - id: "jboss-public"
-    url: "https://repository.jboss.org/nexus/content/groups/public/"
-manifest:
-  maven:
-    groupId: ${project.groupId}
-    artifactId: ${project.artifactId}
-    version: ${project.version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0d804441be0d..620ad3b0f56c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,7 @@
         <ee.dist.product.release.version>${full.dist.product.release.version}</ee.dist.product.release.version>
         <ee.maven.groupId>${project.groupId}</ee.maven.groupId>
         <ee.maven.version>${project.version}</ee.maven.version>
+        <channels.maven.groupId>${project.groupId}.channels</channels.maven.groupId>
         <product.docs.server.version>31</product.docs.server.version>
         <!-- A short variant of product.release.version used in 'startsWith' tests done by dist verification logic -->
         <verifier.product.release.version>${product.docs.server.version}.0</verifier.product.release.version>
@@ -325,6 +326,7 @@
         <version.org.wildfly.jar.plugin>11.0.0.Beta1</version.org.wildfly.jar.plugin>
         <version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
         <version.org.wildfly.plugin>5.0.0.Beta4</version.org.wildfly.plugin>
+        <version.org.wildfly.wildfly-channel-plugin>1.0.9</version.org.wildfly.wildfly-channel-plugin>
         <version.verifier.plugin>1.1</version.verifier.plugin>
         <version.xml.plugin>1.0.2</version.xml.plugin>
 
@@ -592,8 +594,8 @@
             <!-- Keep sorted -->
 
             <dependency>
-                <groupId>${full.maven.groupId}</groupId>
-                <artifactId>wildfly-channel</artifactId>
+                <groupId>${channels.maven.groupId}</groupId>
+                <artifactId>wildfly</artifactId>
                 <version>${full.maven.version}</version>
                 <type>yaml</type>
                 <classifier>manifest</classifier>
@@ -621,8 +623,8 @@
             </dependency>
 
             <dependency>
-                <groupId>${ee.maven.groupId}</groupId>
-                <artifactId>wildfly-ee-channel</artifactId>
+                <groupId>${channels.maven.groupId}</groupId>
+                <artifactId>wildfly-ee</artifactId>
                 <version>${ee.maven.version}</version>
                 <type>yaml</type>
                 <classifier>manifest</classifier>
@@ -706,8 +708,8 @@
             </dependency>
 
             <dependency>
-                <groupId>${ee.maven.groupId}</groupId>
-                <artifactId>wildfly-preview-channel</artifactId>
+                <groupId>${channels.maven.groupId}</groupId>
+                <artifactId>wildfly-preview</artifactId>
                 <version>${ee.maven.version}</version>
                 <type>yaml</type>
                 <classifier>manifest</classifier>
@@ -1366,6 +1368,11 @@
                     <artifactId>wildfly-glow-arquillian-plugin</artifactId>
                     <version>${version.org.wildfly.glow}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-channel-maven-plugin</artifactId>
+                    <version>${version.org.wildfly.wildfly-channel-plugin}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/preview/channel/pom.xml b/preview/channel/pom.xml
index 04571288f053..1ca79b80a71b 100644
--- a/preview/channel/pom.xml
+++ b/preview/channel/pom.xml
@@ -11,16 +11,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
         <groupId>org.wildfly</groupId>
-        <artifactId>wildfly-preview-parent</artifactId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>wildfly-preview-channel</artifactId>
+    <groupId>org.wildfly.channels</groupId>
+    <artifactId>wildfly-preview</artifactId>
 
     <name>WildFly: Preview Feature Pack Channel</name>
     <packaging>pom</packaging>
@@ -29,8 +35,9 @@
 
         <!-- We need the feature pack built first as that generates the manifest -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.wildfly</groupId>
             <artifactId>wildfly-preview-feature-pack</artifactId>
+            <version>${ee.maven.version}</version>
             <type>zip</type>
             <scope>provided</scope>
         </dependency>
@@ -44,7 +51,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
                     <!-- This module's artifact is currently not deployed -->
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
             </plugin>
             <!-- Use the assembly plugin to copy and rename the manifest generated by the feature pack build.
@@ -61,7 +68,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>../channel/assembly.xml</descriptor>
+                                <descriptor>${project.basedir}/assembly.xml</descriptor>
                             </descriptors>
                             <finalName>assembly</finalName>
                             <workDirectory>${project.build.directory}/assembly-src/work</workDirectory>
@@ -137,6 +144,25 @@
                     </execution>-->
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-channel-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>edit-manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
+                    <manifestName>WildFly preview manifest version ${project.version}</manifestName>
+                    <manifestId>${project.groupId}:${project.artifactId}</manifestId>
+                    <manifestDescription>Manifest for WildFly preview feature pack.</manifestDescription>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/preview/channel/src/main/resources/wildfly-preview-channel.yaml b/preview/channel/src/main/resources/wildfly-preview-channel.yaml
deleted file mode 100644
index e237b54d9a10..000000000000
--- a/preview/channel/src/main/resources/wildfly-preview-channel.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-schemaVersion: "2.0.0"
-repositories:
-  - id: "central"
-    url: "https://repo1.maven.org/maven2/"
-  - id: "jboss-public"
-    url: "https://repository.jboss.org/nexus/content/groups/public/"
-manifest:
-  maven:
-    groupId: ${project.groupId}
-    artifactId: ${project.artifactId}
-    version: ${project.version}
diff --git a/testsuite/integration/manualmode-expansion/pom.xml b/testsuite/integration/manualmode-expansion/pom.xml
index 6d47306c623f..dec6a3f0be77 100644
--- a/testsuite/integration/manualmode-expansion/pom.xml
+++ b/testsuite/integration/manualmode-expansion/pom.xml
@@ -289,15 +289,15 @@
                             <channels>
                                 <channel>
                                     <manifest>
-                                        <groupId>${ee.maven.groupId}</groupId>
-                                        <artifactId>wildfly-ee-channel</artifactId>
+                                        <groupId>${channels.maven.groupId}</groupId>
+                                        <artifactId>wildfly-ee</artifactId>
                                         <version>${ee.maven.version}</version>
                                     </manifest>
                                 </channel>
                                 <channel>
                                     <manifest>
-                                        <groupId>${full.maven.groupId}</groupId>
-                                        <artifactId>wildfly-channel</artifactId>
+                                        <groupId>${channels.maven.groupId}</groupId>
+                                        <artifactId>wildfly</artifactId>
                                         <version>${full.maven.version}</version>
                                     </manifest>
                                 </channel>
diff --git a/testsuite/integration/manualmode/pom.xml b/testsuite/integration/manualmode/pom.xml
index f1534a6c1197..ca3eab40e219 100644
--- a/testsuite/integration/manualmode/pom.xml
+++ b/testsuite/integration/manualmode/pom.xml
@@ -334,8 +334,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${ee.maven.groupId}</groupId>
-            <artifactId>wildfly-ee-channel</artifactId>
+            <groupId>org.wildfly.channels</groupId>
+            <artifactId>wildfly-ee</artifactId>
+            <version>32.0.0.Beta1-SNAPSHOT</version>
             <type>yaml</type>
             <classifier>manifest</classifier>
         </dependency>
@@ -418,8 +419,8 @@
                         <channels>
                         <channel>
                             <manifest>
-                                <groupId>${ee.maven.groupId}</groupId>
-                                <artifactId>wildfly-ee-channel</artifactId>
+                                <groupId>${channels.maven.groupId}</groupId>
+                                <artifactId>wildfly-ee</artifactId>
                                 <version>${ee.maven.version}</version>
                             </manifest>
                         </channel>
@@ -456,8 +457,8 @@
                             <channels>
                                 <channel>
                                     <manifest>
-                                        <groupId>${ee.maven.groupId}</groupId>
-                                        <artifactId>wildfly-ee-channel</artifactId>
+                                        <groupId>${channels.maven.groupId}</groupId>
+                                        <artifactId>wildfly-ee</artifactId>
                                         <version>${ee.maven.version}</version>
                                     </manifest>
                                 </channel>