diff --git a/distribution/feature-packs/pom.xml b/distribution/feature-packs/pom.xml
index fef96eba7c..bdf83b4779 100644
--- a/distribution/feature-packs/pom.xml
+++ b/distribution/feature-packs/pom.xml
@@ -32,7 +32,20 @@
 
     <modules>
         <module>adapter-feature-pack</module>
-        <module>server-feature-pack-dependencies</module>
-        <module>server-feature-pack</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>wildfly-dist</id>
+            <activation>
+                <property>
+                    <name>includeWildFly</name>
+                </property>
+            </activation>
+            <modules>
+                <module>server-feature-pack-dependencies</module>
+                <module>server-feature-pack</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index cc326be95e..f33bd960ff 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -39,10 +39,8 @@
         <module>adapters</module>
         <module>saml-adapters</module>
         <module>feature-packs</module>
-        <module>galleon-feature-packs</module>
         <module>licenses-common</module>
         <module>maven-plugins</module>
-        <module>server-dist</module>
         <!--<module>server-overlay</module>-->
     </modules>
 
@@ -74,6 +72,18 @@
     </repositories>
 
     <profiles>
+        <profile>
+            <id>wildfly-dist</id>
+            <activation>
+                <property>
+                    <name>includeWildFly</name>
+                </property>
+            </activation>
+            <modules>
+                <module>galleon-feature-packs</module>
+                <module>server-dist</module>
+            </modules>
+        </profile>
         <profile>
             <id>legacy-dist</id>
             <activation>
diff --git a/pom.xml b/pom.xml
index 332ce7379e..aa27678e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,6 @@
         <module>themes</module>
         <module>model</module>
         <module>util</module>
-        <module>wildfly</module>
         <module>integration</module>
         <module>adapters</module>
         <module>authz</module>
@@ -1903,6 +1902,18 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>wildfly-dist</id>
+            <activation>
+                <property>
+                    <name>includeWildFly</name>
+                </property>
+            </activation>
+            <modules>
+                <module>wildfly</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>community</id>
             <activation>
diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml
index 74d9e3d36a..ec416a9d55 100755
--- a/testsuite/utils/pom.xml
+++ b/testsuite/utils/pom.xml
@@ -68,10 +68,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-admin-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-wildfly-adduser</artifactId>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/wildfly/pom.xml b/wildfly/pom.xml
index 850761690d..9451ada0c9 100755
--- a/wildfly/pom.xml
+++ b/wildfly/pom.xml
@@ -23,7 +23,7 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <name>Keycloak WildFly Integration</name>
+    <name>Keycloak WildFly Server Integration Parent</name>
     <description/>
     <modelVersion>4.0.0</modelVersion>