diff --git a/include/views/default/cockpit2/frontend/deploy/deploy-home.phtml b/include/views/default/cockpit2/frontend/deploy/deploy-home.phtml
index 556edd14e..6b1607d05 100644
--- a/include/views/default/cockpit2/frontend/deploy/deploy-home.phtml
+++ b/include/views/default/cockpit2/frontend/deploy/deploy-home.phtml
@@ -12,7 +12,7 @@
 			</tr>
 			<tr ng-repeat="server in servers">
 				<td><a href="/deploy/server/{{server.id_deploy_server}}">{{server.name}}</a></td>
-				<td>{{server.version.timestamp | date:'MM/dd @ HH:mm'}}</td>
+				<td><span ng-if="server.version.timestamp">{{server.version.timestamp*1000 | date:'MM/dd @ HH:mm'}}</span></td>
 				<td><a href="{{server.repo}}/commit/{{server.version.version}}" target="_system">{{server.version.version}}</a></td>
 			</tr>
 		</table>
@@ -33,7 +33,7 @@
 			<tr ng-repeat="version in versions">
 				<td><a href="/deploy/version/{{version.id_deploy_version}}">{{version.id_deploy_version}}</td>
 				<td>{{version.server.name}}</td>
-				<td>{{version.timestamp | date:'MM/dd @ HH:mm'}}</td>
+				<td>{{version.timestamp*1000 | date:'MM/dd @ HH:mm'}}</td>
 				<td>
 					<span ng-if="version.version">
 						<a href="{{version.server.repo}}/commit/{{version.version}}" target="_system">{{version.version}}</a>
diff --git a/include/views/default/cockpit2/frontend/deploy/deploy-server.phtml b/include/views/default/cockpit2/frontend/deploy/deploy-server.phtml
index 7ada7507e..0767678db 100644
--- a/include/views/default/cockpit2/frontend/deploy/deploy-server.phtml
+++ b/include/views/default/cockpit2/frontend/deploy/deploy-server.phtml
@@ -35,7 +35,7 @@
 			</tr>
 			<tr>
 				<th>Last Update</th>
-				<td>{{server.version.timestamp | date:'MM/dd @ HH:mm'}}</td>
+				<td><span ng-if="server.version.timestamp">{{server.version.timestamp*1000 | date:'MM/dd @ HH:mm'}}</span></td>
 			</tr>
 			<tr>
 				<th>Last Git Version</th>
@@ -81,7 +81,7 @@
 			<tr ng-repeat="version in versions">
 				<td><a href="/deploy/version/{{version.id_deploy_version}}">{{version.id_deploy_version}}</td>
 				<td>{{version.server.name}}</td>
-				<td>{{version.timestamp | date:'MM/dd @ HH:mm'}}</td>
+				<td>{{version.timestamp*1000 | date:'MM/dd @ HH:mm'}}</td>
 				<td>
 					<span ng-if="version.version">
 						<a href="{{version.server.repo}}/commit/{{version.version}}" target="_system">{{version.version}}</a>
diff --git a/include/views/default/cockpit2/frontend/deploy/deploy-version.phtml b/include/views/default/cockpit2/frontend/deploy/deploy-version.phtml
index 8fa7dace4..fa36b9d38 100644
--- a/include/views/default/cockpit2/frontend/deploy/deploy-version.phtml
+++ b/include/views/default/cockpit2/frontend/deploy/deploy-version.phtml
@@ -7,7 +7,7 @@
 		<table>
 			<tr>
 				<th>Date</th>
-				<td>{{version.date}} {{version.timestamp | date:'MM/dd @ HH:mm'}}</td>
+				<td>{{version.timestamp*1000 | date:'MM/dd @ HH:mm'}}</td>
 			</tr>
 			<tr>
 				<th>Server</th>