diff --git a/configuration/pipelines/build.groovy b/configuration/pipelines/build.groovy
index ee71e47..e551b0e 100644
--- a/configuration/pipelines/build.groovy
+++ b/configuration/pipelines/build.groovy
@@ -78,8 +78,11 @@ try {
             def image = docker.build("db-gateway:${env.APPLICATION_VERSION}")
             def latest = docker.build("db-gateway:latest")
 
-            sh "docker tag ${image} ${env.DOCKER_REPOSITORY}/${image}"
-            sh "docker tag ${latest} ${env.DOCKER_REPOSITORY}/${latest}"
+            sh "docker build db-gateway:${env.APPLICATION_VERSION}"
+            sh "docker build db-gateway:latest"
+
+            sh "docker tag db-gateway:${env.APPLICATION_VERSION} ${env.DOCKER_REPOSITORY}/db-gateway:${env.APPLICATION_VERSION}"
+            sh "docker tag db-gateway:latest ${env.DOCKER_REPOSITORY}/db-gateway:latest"
 
             sh "docker push ${env.DOCKER_REPOSITORY}/${image}"
             sh "docker push ${env.DOCKER_REPOSITORY}/${latest}"