diff --git a/Jenkinsfile b/Jenkinsfile
index 310824f35c320630e965e18b1671c7e9265a2bbe..4d6bd2589b3584ac57430870fd1f43b52a760c7b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
         SH_SUCCESS_STATUS_CODE = 0
         IMAGE_TAG = generateImageTag()
         HELM_CHART_VERSION = generateHelmChartVersion()
-        BUILD_PROFILE = setBuildProfile()
+        BUILD_PROFILE = getBuildProfile()
     }
 
     options {
@@ -78,7 +78,7 @@ pipeline {
                 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-                        sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -P $BUILD_PROFILE -Dspring-boot.build-image.publish=true -Duser=${USER} -Dpassword=${PASSWORD}'
+                        sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -P $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD}'
                     }
                 }
             }
@@ -164,7 +164,7 @@ String getPomVersion() {
     return pom.version
 }
 
-String setBuildProfile() {
+String getBuildProfile() {
     if (isMasterBranch()) {
         return "dev"
     } else if (isReleaseBranch()) {
diff --git a/pom.xml b/pom.xml
index 2d83655f79821c473ef3f8fd3bb28c1e24977c5f..10e86e15cbdefd32c26f8f2e4cca038849bcc321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,35 +53,6 @@
 		</dependency>
 	</dependencies>
 	<profiles>
-		<profile>
-			<id>feature</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-maven-plugin</artifactId>
-						<configuration>
-						<image>
-							<name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
-							<publish>true</publish>
-						</image>
-						<docker>
-							<publishRegistry>
-								<username>${user}</username>
-								<password>${password}</password>
-							</publishRegistry>
-							</docker>
-							<excludes>
-								<exclude>
-									<groupId>org.projectlombok</groupId>
-									<artifactId>lombok</artifactId>
-								</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>			
-		</profile>
 		<profile>
 			<id>dev</id>
 			<build>
@@ -90,23 +61,9 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
-						<image>
-							<name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
-							<tags>${imageName}:snapshot-latest</tags>
-							<publish>true</publish>
-						</image>
-						<docker>
-							<publishRegistry>
-								<username>${user}</username>
-								<password>${password}</password>
-							</publishRegistry>
-							</docker>
-							<excludes>
-								<exclude>
-									<groupId>org.projectlombok</groupId>
-									<artifactId>lombok</artifactId>
-								</exclude>
-							</excludes>
+							<image>
+								<tags>${imageName}:snapshot-latest</tags>
+							</image>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -120,23 +77,9 @@
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
-						<image>
-							<name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
-							<tags>${imageName}:latest</tags>
-							<publish>true</publish>
-						</image>
-						<docker>
-							<publishRegistry>
-								<username>${user}</username>
-								<password>${password}</password>
-							</publishRegistry>
-							</docker>
-							<excludes>
-								<exclude>
-									<groupId>org.projectlombok</groupId>
-									<artifactId>lombok</artifactId>
-								</exclude>
-							</excludes>
+							<image>
+								<tags>${imageName}:latest</tags>
+							</image>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -149,6 +92,22 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<image>
+						<name>${imageName}:${env.BRANCH_NAME}-${project.version}</name>
+						<publish>true</publish>
+					</image>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>