diff --git a/core/src/main/resources/keycloak-version.properties b/core/src/main/resources/keycloak-version.properties
index 35a5d57ad3..fa367b82b5 100755
--- a/core/src/main/resources/keycloak-version.properties
+++ b/core/src/main/resources/keycloak-version.properties
@@ -1,2 +1,2 @@
-version=${project.version}
-build-time=${timestamp}
\ No newline at end of file
+version=${product.version}
+build-time=${product.build-time}
\ No newline at end of file
diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml
index ba360d9f86..01588e20db 100644
--- a/distribution/feature-packs/server-feature-pack/pom.xml
+++ b/distribution/feature-packs/server-feature-pack/pom.xml
@@ -30,11 +30,6 @@
     <name>Keycloak Feature Pack: Server</name>
     <packaging>pom</packaging>
 
-    <properties>
-        <product.name>Keycloak</product.name>
-        <product.version>${project.version}</product.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/pom.xml b/pom.xml
index e07ba34c57..981547353c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,10 @@
     <packaging>pom</packaging>
 
     <properties>
+        <product.name>Keycloak</product.name>
+        <product.version>${project.version}</product.version>
+        <product.build-time>${timestamp}</product.build-time>
+
         <apacheds.version>2.0.0-M17</apacheds.version>
         <apacheds.codec.version>1.0.0-M23</apacheds.codec.version>
         <org.apache.james.apache-mime4j.version>0.6</org.apache.james.apache-mime4j.version>