diff --git a/pom.xml b/pom.xml
index a14dc48..edd597f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>edu.stanford.protege</groupId>
 	<artifactId>webprotege-event-history-service</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0</version>
 	<name>webprotege-event-history-service</name>
 	<description>Service that contains business specific events in order to be queried</description>
 	<properties>
@@ -55,6 +55,12 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
 		</dependency>-->
+
+		<dependency>
+			<groupId>edu.stanford.protege</groupId>
+			<artifactId>webprotege-backend-api</artifactId>
+			<version>2.0.0-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>webprotege-entity-frames</artifactId>
@@ -75,11 +81,6 @@
 			<artifactId>spring-rabbit-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>edu.stanford.protege</groupId>
-			<artifactId>webprotege-backend-api</artifactId>
-			<version>1.0.3</version>
-		</dependency>
 
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
@@ -147,26 +148,47 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>dockerfile-maven-plugin</artifactId>
-				<version>1.4.13</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
-						<id>default</id>
+						<id>docker-build</id>
+						<phase>package</phase>
 						<goals>
-							<goal>build</goal>
+							<goal>exec</goal>
 						</goals>
+						<configuration>
+							<executable>docker</executable>
+							<workingDirectory>${project.basedir}</workingDirectory>
+							<arguments>
+								<argument>build</argument>
+								<argument>-f</argument>
+								<argument>Dockerfile</argument>
+								<argument>--build-arg</argument>
+								<argument>JAR_FILE=${project.artifactId}-${project.version}.jar</argument>
+								<argument>-t</argument>
+								<argument>protegeproject/${project.artifactId}:${project.version}</argument>
+								<argument>.</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>docker-push</id>
+						<phase>install</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<executable>docker</executable>
+							<workingDirectory>${project.basedir}</workingDirectory>
+							<arguments>
+								<argument>push</argument>
+								<argument>protegeproject/${project.artifactId}:${project.version}</argument>
+							</arguments>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<repository>protegeproject/${project.artifactId}</repository>
-					<tag>${project.version}</tag>
-					<buildArgs>
-						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-					</buildArgs>
-					<!--					<username>${env.DOCKER_USERNAME}</username>-->
-					<!--					<password>${env.DOCKER_PASSWORD}</password>-->
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>