diff --git a/resources/Dockerfile b/Dockerfile
similarity index 58%
rename from resources/Dockerfile
rename to Dockerfile
index b8f94204..44e92d0d 100644
--- a/resources/Dockerfile
+++ b/Dockerfile
@@ -6,5 +6,5 @@
 
 FROM openjdk:8-jre
 VOLUME /var/ptm
-COPY ptm_backend-1.6.jar app.jar
-ENTRYPOINT ["java","-Dptm.filestore=/var/ptm", "-jar","/app.jar"]
+COPY codebase/ptm_backend/target/ptm.jar ptm.jar
+ENTRYPOINT ["java","-Dptm.filestore=/var/ptm", "-jar","/ptm.jar"]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e6eb5ddb..f9a35922 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,6 +5,9 @@ trigger:
 pool:
   vmImage: 'ubuntu-latest'
 
+variables:
+  PTM.Version: 1.6
+ 
 steps:
 - task: Maven@3
   inputs:
@@ -29,4 +32,10 @@ steps:
   inputs:
     codeCoverageTool: 'jaCoCo' 
     summaryFileLocation: 'target/codecoverage/jacoco.xml'
-    reportDirectory: 'target/codecoverage' 
\ No newline at end of file
+    reportDirectory: 'target/codecoverage'
+    
+- script: |
+    docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) .
+    docker login -u lgblaumeiser -p $(ptm.docker_pwd)
+    docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber)
+    
\ No newline at end of file
diff --git a/codebase/ptm_backend/pom.xml b/codebase/ptm_backend/pom.xml
index e2ac196f..1c7613da 100644
--- a/codebase/ptm_backend/pom.xml
+++ b/codebase/ptm_backend/pom.xml
@@ -13,7 +13,7 @@
 	<artifactId>ptm_backend</artifactId>
     <version>1.6-SNAPSHOT</version>
 	<packaging>jar</packaging>
-
+ 
 	<name>PTM Backend</name>
 	<description>Backend server for Project Time Manager with web and rest interface</description>
 
@@ -69,6 +69,7 @@
   	</dependencies>
 
 	<build>
+		<finalName>ptm</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/codebase/ptm_cli/pom.xml b/codebase/ptm_cli/pom.xml
index e292f799..39b92209 100644
--- a/codebase/ptm_cli/pom.xml
+++ b/codebase/ptm_cli/pom.xml
@@ -68,13 +68,12 @@
 				<descriptorRef>jar-with-dependencies</descriptorRef>
 			</descriptorRefs>
         	<appendAssemblyId>false</appendAssemblyId>
-        	<!-- MainClass in mainfest make a executable jar -->
+        	<!-- MainClass in manifest make a executable jar -->
 			<archive>
 			  <manifest>
 				<mainClass>de.lgblaumeiser.ptm.cli.ProjectTimeManager</mainClass>
 			  </manifest>
 			</archive>
-
 		</configuration>
 		<executions>
 		  <execution>