diff --git a/Dockerfile b/Dockerfile
index 321beb6d543ac97d3aca9b2137b43a44fcdaea71..89a7bad9bfd864e555870c12f35fd07d4d8eef38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,14 @@
 # Docker file for Spring Boot Admin
 #
 
-FROM maven:3.3.9-jdk-8-onbuild-alpine
+FROM maven:3.3.9-jdk-8-alpine
 MAINTAINER Merapar
 
-ENV TZ UTC
\ No newline at end of file
+ENV TZ UTC
+
+RUN     mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+ADD     . /usr/src/app
+
+CMD     mvn package && java -jar target/spring-boot-admin-1.4.4.jar
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bf7f523c61bb8021758fabb7a19f010bc4f77fcf..76de7189d486cb2cb5cd14cb2beda1ada2a05563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,13 @@
     <name>spring-boot-admin</name>
     <url>http://maven.apache.org</url>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.4.2.RELEASE</version>
+        <relativePath/>
+    </parent>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/src/main/java/com/merapar/springbootadmin/Application.java b/src/main/java/com/merapar/springbootadmin/Application.java
index 2fa7e76ffbb5ff2b5061f08841d02ce8a0fb4c27..52c2176c9830ec554493066831d136b1a11493a2 100644
--- a/src/main/java/com/merapar/springbootadmin/Application.java
+++ b/src/main/java/com/merapar/springbootadmin/Application.java
@@ -3,10 +3,10 @@ package com.merapar.springbootadmin;
 import de.codecentric.boot.admin.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableAdminServer
 public class Application {
     public static void main(String[] args) {