diff --git a/common/src/main/java/org/keycloak/common/Version.java b/common/src/main/java/org/keycloak/common/Version.java
index 21280bb8c16..112309f5387 100755
--- a/common/src/main/java/org/keycloak/common/Version.java
+++ b/common/src/main/java/org/keycloak/common/Version.java
@@ -27,27 +27,33 @@ import java.util.Properties;
  */
 public class Version {
     public static final String UNKNOWN = "UNKNOWN";
-    public static final String NAME = "Keycloak";
-    public static final String NAME_HTML = "<div class=\"kc-logo-text\"><span>Keycloak</span></div>";
     public static String VERSION;
     public static String RESOURCES_VERSION;
     public static String BUILD_TIME;
 
+    private static String name;
+
     static {
         try (InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties")) {
             Properties props = new Properties();
             props.load(is);
             Version.VERSION = props.getProperty("version");
             Version.BUILD_TIME = props.getProperty("build-time");
+            name = props.getProperty("name");
             Version.RESOURCES_VERSION = Version.VERSION.toLowerCase();
 
             if (Version.RESOURCES_VERSION.endsWith("-snapshot")) {
                 Version.RESOURCES_VERSION = Version.RESOURCES_VERSION.replace("-snapshot", "-" + Version.BUILD_TIME.replace(" ", "").replace(":", "").replace("-", ""));
             }
+
         } catch (IOException e) {
             Version.VERSION = Version.UNKNOWN;
             Version.BUILD_TIME = Version.UNKNOWN;
+            name = "Keycloak";
         }
     }
 
+    public static final String NAME = name;
+    public static final String NAME_HTML = "<div class=\"kc-logo-text\"><span>" + name + "</span></div>";
+
 }
diff --git a/common/src/main/resources/keycloak-version.properties b/common/src/main/resources/keycloak-version.properties
index 518a78547b8..960eb363b73 100755
--- a/common/src/main/resources/keycloak-version.properties
+++ b/common/src/main/resources/keycloak-version.properties
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 version=${project.version}
-build-time=${project.build-time}
\ No newline at end of file
+build-time=${project.build-time}
+name=${project.build-name}
\ No newline at end of file
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 313552c36d9..845f5265ac8 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -82,6 +82,17 @@
                 <module>downloads</module>
             </modules>
         </profile>
+        <profile>
+            <id>dist-api-docs</id>
+            <activation>
+                <property>
+                    <name>dist.api.docs</name>
+                </property>
+            </activation>
+            <modules>
+                <module>api-docs-dist</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
index a760e4aa023..a7cc40af8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
         <jboss-logging-annotations.version>3.0.4.Final</jboss-logging-annotations.version> <!-- keep in sync with the version used by quarkus -->
 
         <project.build-time>${timestamp}</project.build-time>
+        <project.build-name>Keycloak</project.build-name>
 
         <!-- Following properties are used for downstream build to alter final distribution archive file name and internal base directory of the archive. -->
         <dist.archive.file.prefix>keycloak</dist.archive.file.prefix>
diff --git a/quarkus/dist/src/main/version.txt b/quarkus/dist/src/main/version.txt
index b2ac2cf0db9..7b373b8b4f8 100644
--- a/quarkus/dist/src/main/version.txt
+++ b/quarkus/dist/src/main/version.txt
@@ -1 +1 @@
-Keycloak - Version ${project.version}
+${project.build-name} - Version ${project.version}