diff --git a/ogWebconsole/Jenkinsfile b/ogWebconsole/Jenkinsfile
index 7b725b8..fd7426e 100644
--- a/ogWebconsole/Jenkinsfile
+++ b/ogWebconsole/Jenkinsfile
@@ -18,8 +18,14 @@ pipeline {
                 echo 'Building....'
                 script {
                     dir('ogWebconsole') {
-                        docker.build("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}", "-f Dockerfile .")
-                        docker.build("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest", "-f Dockerfile .")
+                        IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
+                        if (BRANCH_NAME == 'main') {
+                            LATEST_ID = 'latest'
+                        }  else {
+                            LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest"
+                        }
+                        docker.build("${IMAGE_ID}", "-f Dockerfile .")
+                        docker.build("${LATEST_ID}", "-f Dockerfile .")
                     }
                 }
             }
@@ -29,10 +35,8 @@ pipeline {
                 echo 'Pushing....'
                 script {
                     docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials' ) {
-                        dir('ogWebconsole') {
-                            docker.image("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}").push()
-                            docker.image("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest").push()
-                        }
+                            docker.image("${IMAGE_ID}").push()
+                            docker.image("${LATEST_ID}").push()
                     }
                 }
             }