diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09a2876e088cfedbcf53acd1472460b82d83a9e0..35c51b429f27a892b4a7aff0950561de3568f2a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,11 +44,11 @@ build_image:
         --destination "${CI_REGISTRY_IMAGE}:$IMAGE_TAG"
         --verbosity=debug
     - |
-      if [ ! -z "$ADDITIONAL_TAG" ]; then
+      if [ "$CI_COMMIT_REF_NAME" = "12-create-a-pipeline-to-build-and-publish-the-docker-image-in-gitlab-registry" ]; then
         /kaniko/executor
           --context "${CI_PROJECT_DIR}"
           --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-          --destination "${CI_REGISTRY_IMAGE}:$ADDITIONAL_TAG"
+          --destination "${CI_REGISTRY_IMAGE}:latest"
       fi
   rules:
     - if: '$CI_COMMIT_REF_NAME == "12-create-a-pipeline-to-build-and-publish-the-docker-image-in-gitlab-registry" || $CI_COMMIT_REF_NAME == "develop"'
diff --git a/Dockerfile b/Dockerfile
index de4f2e04543eff7449b0e0c153ffbc03e4338a11..1ecd8804fa8350b17f1d0a82de6da739138524aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,4 @@
-FROM openjdk:17-jdk
-CMD ["java", "-version"]
-
-# FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
+FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
 # RUN mkdir /opt/shareclasses
 # RUN mkdir -p /opt/openslice/lib/
 # COPY target/org.etsi.osl.tmf.api-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/