diff --git a/Jenkinsfile b/Jenkinsfile
index bb7775e5fd..f39b575aba 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,18 +4,18 @@ node {
     stage ('Checkout') {
         checkout scm
     }
-    stage ('Install Node dependencies') {
+    stage ('Install') {
         nodejs('node-lts') {
             sh "npm install --no-audit"
             sh "gulp install"
         }
     }
-    stage ('Build project') {
+    stage ('Build') {
         nodejs('node-lts') {
             sh "gulp build"
         }
     }
-    stage ('Docker deployment') {
+    stage ('Deploy') {
         withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
             switch (env.BRANCH_NAME) {
                 case 'master':
@@ -38,13 +38,10 @@ node {
                     break;
             }
 
-            env.COMPOSE_PROJECT_NAME = env.JOB_BASE_NAME
-            env.DOCKER_TLS_VERIFY = 1
-            env.TAG = env.NODE_ENV
 
-            if (env.BRANCH_NAME != 'master') {
-                env.COMPOSE_PROJECT_NAME = "${env.BRANCH_NAME}-${env.COMPOSE_PROJECT_NAME}"
-            }
+            env.COMPOSE_PROJECT_NAME = env.JOB_NAME.replace('/', '-');
+            env.DOCKER_TLS_VERIFY = 1
+            env.TAG = env.BRANCH_NAME
 
             env.DOCKER_HOST = 'tcp://vch1.verdnatura.es:2376';
             sh "docker-compose up --build -d"