diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh
index 625c2dec126..265e66e7ee9 100755
--- a/configuration/buildAndUpdateProduct.sh
+++ b/configuration/buildAndUpdateProduct.sh
@@ -49,7 +49,7 @@ create_version_info_files ()
     echo "{
     \"commit_id\":\"$HEAD_SHA\",
     \"active_branch\":\"$active_branch\",
-    \"commit_date\":\"$HEAD_DATE\",
+    \"build_date\":\"$HEAD_DATE\",
     \"release\":\"$SIMPLE_VERSION_INFO\"
 }" > "${VERSION_JSON}"
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StatusServlet.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StatusServlet.java
index 97216b5150d..c5aecdb2c31 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StatusServlet.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StatusServlet.java
@@ -52,10 +52,7 @@ public class StatusServlet extends HttpServlet {
         result.put("buildversion", ServerInfo.getBuildVersion());
         try {
             final JSONObject versionAsJson = ServerInfo.getBuildVersionJson();
-            result.put("commit_id", versionAsJson.get("commit_id"));
-            result.put("active_branch", versionAsJson.get("active_branch"));
-            result.put("commit_date", versionAsJson.get("commit_date"));
-            result.put("release", versionAsJson.get("release"));
+            result.putAll(versionAsJson);
             final long numberOfTrackedRacesToRestore = service.getNumberOfTrackedRacesToRestore();
             result.put("numberofracestorestore", numberOfTrackedRacesToRestore);
             final int numberOfTrackedRacesRestored = service.getNumberOfTrackedRacesRestored();
@@ -84,4 +81,4 @@ public class StatusServlet extends HttpServlet {
             throw new RuntimeException(e);
         }
     }
-}
\ No newline at end of file
+}