diff --git a/Jenkinsfile b/Jenkinsfile
index 5a866ccce484aabf505f8dc0ab759e7dd59af8a8..89df2663aad7a9a9c85a3fd8cd2168c9172ad063 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,7 @@ pipeline {
                 }
 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh 'mvn -s $MAVEN_SETTINGS versions:set-property -Dproperty="build.number" -DnewVersion=${currentBuild.number}'
                     sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
                 }
             }
diff --git a/pom.xml b/pom.xml
index 44a9a2d3998cebe3969cd3fd1f127f895484dfa9..2bd6904b77e309db5aec180ada68104f56681b35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,9 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Administration</name>
 	<description>Administration Backend Project</description>
+	<properties>
+		<build.number>?</build.number>
+	</properties>
 	<dependencies>
 		<!-- Spring -->
 		<dependency>
@@ -79,6 +82,11 @@
 						<goals>
 							<goal>build-info</goal>
 						</goals>
+						<configuration>
+							<additionalProperties>
+								<number>${build.number}</number>
+							</additionalProperties>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/src/main/java/de/ozgcloud/admin/RootService.java b/src/main/java/de/ozgcloud/admin/RootService.java
index c72ccf2f7c58d4563314d4ae4363a818fae2f3c9..a78e230be0f581d6c0d400dea11ed0a6dc0d9e18 100644
--- a/src/main/java/de/ozgcloud/admin/RootService.java
+++ b/src/main/java/de/ozgcloud/admin/RootService.java
@@ -18,18 +18,14 @@ class RootService {
 	}
 
 	public Instant getBuildTime() {
-		return buildProperties.map(BuildProperties::getTime).orElse(Instant.now());
+		return buildProperties.map(BuildProperties::getTime).orElse(null);
 	}
 
 	public String getJavaVersion() {
-		return System.getProperty("java.version", "?");
+		return System.getProperty("java.version");
 	}
 
 	public String getBuildNumber() {
 		return buildProperties.map(p -> p.get("number")).orElse("?");
 	}
-
-	public String getBuildUrl() {
-		return buildProperties.map(p -> p.get("url")).orElse("?");
-	}
 }