diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml
index 4abed673d40d27ee70399e7de97d4895d9c82070..66607e557686a8e4a650ba3165b234c6cc7dd57f 100644
--- a/services/docker-compose-register.yml
+++ b/services/docker-compose-register.yml
@@ -1,5 +1,7 @@
 services:
   register:
+    hostname: ${CAPIF_REGISTER}
+    container_name: ${CAPIF_REGISTER}
     build:
       context: ${SERVICES_DIR}/register
     ports:
@@ -14,6 +16,7 @@ services:
       - LOG_LEVEL=${LOG_LEVEL}
       - TIMEOUT=10
       - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - REGISTER_HOSTNAME=${CAPIF_REGISTER}
     extra_hosts:
       - host.docker.internal:host-gateway
       - vault:host-gateway
diff --git a/services/register/register_prepare.sh b/services/register/register_prepare.sh
index 2ae8deff25fce905a937fa87767796a9685f8482..7cc7b3760674731611dc3fe5e3359596a1e6b8d9 100644
--- a/services/register/register_prepare.sh
+++ b/services/register/register_prepare.sh
@@ -17,7 +17,7 @@ STATE="Madrid"            # state or province name
 LOCALITY="Madrid"        # Locality Name (e.g. city)
 ORGNAME="Telefonica I+D" # Organization Name (eg, company)
 ORGUNIT="Innovation"                  # Organizational Unit Name (eg. section)
-COMMONNAME="register"
+COMMONNAME=${REGISTER_HOSTNAME:-register}
 EMAIL="inno@tid.es"    # certificate's email address
 # optional extra details
 CHALLENGE=""                # challenge password
diff --git a/services/run.sh b/services/run.sh
index 9f2983bb3c3d79045a1f22764eaa5e5e9a296ffb..5acc9afe69c71235ce234378b6bbe2f1236b3027 100755
--- a/services/run.sh
+++ b/services/run.sh
@@ -4,6 +4,7 @@ source $(dirname "$(readlink -f "$0")")/variables.sh
 help() {
   echo "Usage: $1 <options>"
   echo "       -c : Setup different hostname for capif"
+  echo "       -R : Setup different hostname for register service"
   echo "       -s : Run Mock server. Default true"
   echo "       -m : Run monitoring service"
   echo "       -l : Set Log Level (default DEBUG). Select one of: [CRITICAL, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, NOTSET]"
@@ -40,6 +41,9 @@ while getopts ":c:l:ms:hrv:f:g:b:" opt; do
     c)
       CAPIF_HOSTNAME="$OPTARG"
       ;;
+    R)
+      CAPIF_REGISTER="$OPTARG"
+      ;;
     m)
       MONITORING_STATE=true
       ;;
@@ -78,7 +82,7 @@ while getopts ":c:l:ms:hrv:f:g:b:" opt; do
   esac
 done
 
-echo Nginx hostname will be $CAPIF_HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_STATE
+echo Nginx hostname will be $CAPIF_HOSTNAME, Register Hostname $CAPIF_REGISTER, deploy $DEPLOY, monitoring $MONITORING_STATE
 
 if [ "$BUILD_DOCKER_IMAGES" == "true" ] ; then
     echo '***Building Docker images set as true***'
@@ -139,7 +143,7 @@ yq eval ".ccf.url = \"$CAPIF_HOSTNAME\"" -i "$REGISTER_CONFIG_FILE" -P
 
 # Deploy Register service
 CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat ${SERVICES_DIR}/nginx/certs/server.key)")
-REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach $BUILD $CACHED_INFO
+REGISTRY_BASE_URL=$REGISTRY_BASE_URL SERVICES_DIR=$SERVICES_DIR OCF_VERSION=$OCF_VERSION CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL CAPIF_REGISTER=$CAPIF_REGISTER docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach $BUILD $CACHED_INFO
 
 status=$?
 if [ $status -eq 0 ]; then