diff --git a/DockerPipelinePluginJenkinsfile b/DockerPipelinePluginJenkinsfile
index 86937b4..0e604f9 100644
--- a/DockerPipelinePluginJenkinsfile
+++ b/DockerPipelinePluginJenkinsfile
@@ -9,11 +9,11 @@ pipeline {
     }
     environment {
         // Executem una comanda shell per obtenir la data actual i la guardem com a variable
-        DATA = sh(returnStdout: true, script: 'date +%Y-%m-%d').trim()
+        DATA = sh(returnStdout: true, script: 'date +%Y.%m.%d').trim()
         DOCKER_HUB_USER='guillemhs'
         IMAGE_NAME="${DOCKER_HUB_USER}/the-example-app-nodejs"
         REGISTRY_CRED_ID='docker-credentials'
-        TAG="${DATA}-${env.BUILD_NUMBER}"
+        TAG="${DATA}.${env.BUILD_NUMBER}"
     }
     stages {
         stage('Checkout') {
@@ -26,7 +26,7 @@ pipeline {
             steps {
                 script{
                     echo "Build image ..."
-                    docker.build("${IMAGE_NAME}:${env.BUILD_NUMBER}")
+                    docker.build("${IMAGE_NAME}:${TAG}")
                 }
             }
         }
@@ -48,7 +48,7 @@ pipeline {
     post{
         always{
             cleanWs()
-            sh "docker rmi ${TAG} || true"
+            sh "docker rmi ${IMAGE_NAME}:${TAG} || true"
             sh "docker rmi ${IMAGE_NAME}:latest || true"
         }
     }