diff --git a/distribution/downloads/src/main/resources/files b/distribution/downloads/src/main/resources/files
index d84fa46929..068296cb67 100644
--- a/distribution/downloads/src/main/resources/files
+++ b/distribution/downloads/src/main/resources/files
@@ -1,5 +1,6 @@
 ./
     keycloak-server-dist:keycloak
+    keycloak-server-x-dist:keycloak.x-preview
     keycloak-server-overlay:keycloak-overlay
     keycloak-api-docs-dist:keycloak-api-docs
     keycloak-examples-dist:keycloak-examples
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 445ca577ed..75a999ec8d 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -68,9 +68,14 @@
             </modules>
         </profile>
         <profile>
-            <id>quarkus</id>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
             <modules>
-                <module>server-x</module>
+                <module>server-x-dist</module>
             </modules>
         </profile>
     </profiles>
diff --git a/distribution/server-x/assembly.xml b/distribution/server-x-dist/assembly.xml
similarity index 100%
rename from distribution/server-x/assembly.xml
rename to distribution/server-x-dist/assembly.xml
diff --git a/distribution/server-x/pom.xml b/distribution/server-x-dist/pom.xml
similarity index 98%
rename from distribution/server-x/pom.xml
rename to distribution/server-x-dist/pom.xml
index 4d3c23c3e7..df4c4c72c1 100755
--- a/distribution/server-x/pom.xml
+++ b/distribution/server-x-dist/pom.xml
@@ -24,7 +24,7 @@
         <version>12.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>keycloak-server-x</artifactId>
+    <artifactId>keycloak-server-x-dist</artifactId>
     <packaging>pom</packaging>
     <name>Keycloak.X Server Distribution</name>
     <description/>
diff --git a/distribution/server-x/src/main/README.txt b/distribution/server-x-dist/src/main/README.txt
similarity index 100%
rename from distribution/server-x/src/main/README.txt
rename to distribution/server-x-dist/src/main/README.txt
diff --git a/distribution/server-x/src/main/content/bin/kc.bat b/distribution/server-x-dist/src/main/content/bin/kc.bat
similarity index 100%
rename from distribution/server-x/src/main/content/bin/kc.bat
rename to distribution/server-x-dist/src/main/content/bin/kc.bat
diff --git a/distribution/server-x/src/main/content/bin/kc.sh b/distribution/server-x-dist/src/main/content/bin/kc.sh
similarity index 100%
rename from distribution/server-x/src/main/content/bin/kc.sh
rename to distribution/server-x-dist/src/main/content/bin/kc.sh
diff --git a/distribution/server-x/src/main/content/conf/keycloak.properties b/distribution/server-x-dist/src/main/content/conf/keycloak.properties
similarity index 100%
rename from distribution/server-x/src/main/content/conf/keycloak.properties
rename to distribution/server-x-dist/src/main/content/conf/keycloak.properties
diff --git a/distribution/server-x/src/main/content/providers/README.md b/distribution/server-x-dist/src/main/content/providers/README.md
similarity index 100%
rename from distribution/server-x/src/main/content/providers/README.md
rename to distribution/server-x-dist/src/main/content/providers/README.md
diff --git a/distribution/server-x/src/main/content/themes/README.txt b/distribution/server-x-dist/src/main/content/themes/README.txt
similarity index 100%
rename from distribution/server-x/src/main/content/themes/README.txt
rename to distribution/server-x-dist/src/main/content/themes/README.txt
diff --git a/distribution/server-x/src/main/version.txt b/distribution/server-x-dist/src/main/version.txt
similarity index 100%
rename from distribution/server-x/src/main/version.txt
rename to distribution/server-x-dist/src/main/version.txt
diff --git a/pom.xml b/pom.xml
index 5f62b427d6..e1e9fa4242 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1313,7 +1313,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-server-x</artifactId>
+                <artifactId>keycloak-server-x-dist</artifactId>
                 <version>${project.version}</version>
                 <type>zip</type>
             </dependency>
@@ -1696,6 +1696,9 @@
                 <apache.httpcomponents.fuse.version>4.5.2</apache.httpcomponents.fuse.version>
                 <apache.httpcomponents.httpcore.fuse.version>4.4.4</apache.httpcomponents.httpcore.fuse.version>
             </properties>
+            <modules>
+                <module>quarkus</module>
+            </modules>
         </profile>
 
         <profile>
@@ -1814,12 +1817,5 @@
             </build>
         </profile>
 
-        <profile>
-            <id>quarkus</id>
-            <modules>
-                <module>quarkus</module>
-            </modules>
-        </profile>
-
     </profiles>
 </project>
diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
index 605c365c44..ca2b8f2700 100644
--- a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-x</artifactId>
+            <artifactId>keycloak-server-x-dist</artifactId>
             <type>zip</type>
         </dependency>
     </dependencies>
@@ -125,7 +125,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-server-x</artifactId>
+                                    <artifactId>keycloak-server-x-dist</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/unpacked</outputDirectory>