diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 4281ca83e233d400a38c97af15c94450c61c6bb4..d14b522395f38c9264d7b96787a11036727a6950 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -43,6 +43,14 @@
     # Get ID of image created by ddeploy
     - 'DOCKER_ID=$(docker images --format="{{.ID}}" | head -1)'
     - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/enforce_labels.bash | bash -s -- ${DOCKER_ID}
+    # if USER_DOCKER_PUSH_NAME is not defined, shorten the default DOCKER_PUSH_NAME
+    - >
+      if [ -z ${USER_DOCKER_PUSH_NAME} ] ; then
+        echo USER_DOCKER_PUSH_NAME was not defined, using default docker image name
+        DOCKER_PUSH_NAME=${DOCKER_PUSH_NAME#$CI_PROJECT_ROOT_NAMESPACE/}
+      else
+        DOCKER_PUSH_NAME=${USER_DOCKER_PUSH_NAME}
+      fi
     # Tag and push with the branch or tag name.
     - echo "Pushing to ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}"
     - docker tag ${DOCKER_ID} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}