diff --git a/opensync-gateway-cloud-docker/pom.xml b/opensync-gateway-cloud-docker/pom.xml
index a4c307c..cae13e7 100644
--- a/opensync-gateway-cloud-docker/pom.xml
+++ b/opensync-gateway-cloud-docker/pom.xml
@@ -11,9 +11,11 @@
 	<name>opensync-gateway-cloud-docker</name>
 	<description>Docker definition for opensync gateway that uses cloud configuration</description>
 
-	<properties>
+	<properties>	
 		<docker.fabric.version>0.28.0</docker.fabric.version>
 		<docker.push.registry>tip-tip-wlan-cloud-docker-repo.jfrog.io</docker.push.registry>
+        <timestamp>${maven.build.timestamp}</timestamp>
+   		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> 		
 	</properties>
 
 	<dependencies>
@@ -38,6 +40,9 @@
 						<image>
 							<name>opensync-gateway-cloud:${project.version}</name>
 							<build>
+                            <tags>
+                            	<tag>${project.version}-${timestamp}</tag>
+                            </tags> 							
 								<filter>@</filter>
 								<cleanup>try</cleanup>
 								<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
diff --git a/opensync-gateway-static-docker/pom.xml b/opensync-gateway-static-docker/pom.xml
index 69cb202..fcd4f60 100644
--- a/opensync-gateway-static-docker/pom.xml
+++ b/opensync-gateway-static-docker/pom.xml
@@ -14,6 +14,8 @@
 	<properties>
 		<docker.fabric.version>0.28.0</docker.fabric.version>
 		<docker.push.registry>tip-tip-wlan-cloud-docker-repo.jfrog.io</docker.push.registry>
+        <timestamp>${maven.build.timestamp}</timestamp>
+   		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> 		
 	</properties>
 
 	<dependencies>
@@ -38,6 +40,9 @@
 						<image>
 							<name>opensync-gateway-static:${project.version}</name>
 							<build>
+                            <tags>
+                            	<tag>${project.version}-${timestamp}</tag>
+                            </tags> 								
 								<filter>@</filter>
 								<cleanup>try</cleanup>
 								<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@@ -60,6 +65,9 @@
                                                 <image>
                                                         <name>opensync-gateway-and-mqtt:${project.version}</name>
                                                         <build>
+                                                        	<tags>
+                            									<tag>${project.version}-${timestamp}</tag>
+                            								</tags>
                                                                 <filter>@</filter>
                                                                 <cleanup>try</cleanup>
                                                                 <dockerFileDir>${project.basedir}/src/main/docker-opensync-gateway-and-mqtt</dockerFileDir>