diff --git a/openvidu-server/deployments/enterprise/aws/createAMI.sh b/openvidu-server/deployments/enterprise/aws/createAMI.sh
index 172111a6..c2713c03 100755
--- a/openvidu-server/deployments/enterprise/aws/createAMI.sh
+++ b/openvidu-server/deployments/enterprise/aws/createAMI.sh
@@ -115,7 +115,6 @@ fi
 # Updating the template
 sed "s/OV_MASTER_REPLICATION_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu-Enterprise.yaml.template >CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml
 sed -i "s/KMS_AMI_ID/${KMS_AMI_ID}/g" CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml
-sed -i "s/AWS_CLI_DOCKER_TAG/${AWS_CLI_DOCKER_TAG}/g" CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml
 
 # Update CF template
 if [[ ${UPDATE_S3_FILES} == "true" ]]; then
diff --git a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template
index bbd69b6c..b3ae4336 100644
--- a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template
+++ b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template
@@ -116,7 +116,7 @@ Resources:
                 set -eu -o pipefail
 
                 # AWS cli
-                docker pull amazon/aws-cli:AWS_DOCKER_TAG
+                docker pull amazon/aws-cli:AWS_CLI_DOCKER_TAG
 
                 # Openvidu recording
                 docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG
diff --git a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
index df1740cc..10aa6160 100755
--- a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
+++ b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
@@ -38,7 +38,7 @@ else
 fi
 sed -i "s/AWS_KEY_NAME/${AWS_KEY_NAME}/g" cfn-crete-ov-aws-asg-ami.yaml
 sed -i "s/USE_MASTER_DOCKER_IMAGES/${USE_MASTER_DOCKER_IMAGES}/g" cfn-crete-ov-aws-asg-ami.yaml
-sed -i "s/AWS_DOCKER_TAG/${AWS_DOCKER_TAG}/g" cfn-crete-ov-aws-asg-ami.yaml
+sed -i "s/AWS_CLI_DOCKER_TAG/${AWS_CLI_DOCKER_TAG}/g" cfn-crete-ov-aws-asg-ami.yaml
 sed -i "s/OPENVIDU_RECORDING_DOCKER_TAG/${OPENVIDU_RECORDING_DOCKER_TAG}/g" cfn-crete-ov-aws-asg-ami.yaml
 sed -i "s/OPENVIDU_VERSION/${OPENVIDU_PRO_VERSION}/g" cfn-crete-ov-aws-asg-ami.yaml
 sed -i "s/AMIEUWEST1/${AMIEUWEST1}/g" cfn-crete-ov-aws-asg-ami.yaml
@@ -100,7 +100,6 @@ fi
 cd ..
 sed "s/OV_MASTER_REPLICATION_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu-Enterprise.yaml.template >CF-OpenVidu-Enterprise-dev-${OPENVIDU_PRO_VERSION}.yaml
 sed -i "s/KMS_AMI_ID/${KMS_AMI_ID}/g" CF-OpenVidu-Enterprise-dev-${OPENVIDU_PRO_VERSION}.yaml
-sed -i "s/AWS_DOCKER_TAG/${AWS_DOCKER_TAG}/g" CF-OpenVidu-Enterprise-dev-${OPENVIDU_PRO_VERSION}.yaml
 # Update CF template
 aws s3 cp CF-OpenVidu-Enterprise-dev-${OPENVIDU_PRO_VERSION}.yaml s3://aws.openvidu.io/CF-OpenVidu-Enterprise-dev-${OPENVIDU_PRO_VERSION}.yaml --acl public-read
 
diff --git a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template
index a77714db..e6455dac 100644
--- a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template
+++ b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template
@@ -610,7 +610,7 @@ Resources:
                 sed -i "s/#AWS_SUBNET_ID=/AWS_SUBNET_ID=${OpenViduSubnet}/" $WORKINGDIR/.env
                 sed -i "s/#AWS_STACK_ID=/AWS_STACK_ID=$(echo ${AWS::StackId} | sed 's#/#\\/#g')/" $WORKINGDIR/.env
                 sed -i "s/#AWS_STACK_NAME=/AWS_STACK_NAME=${AWS::StackName}/" $WORKINGDIR/.env
-                sed -i "s/#AWS_CLI_DOCKER_TAG=/AWS_CLI_DOCKER_TAG=AWS_CLI_DOCKER_TAG/" $WORKINGDIR/.env
+                sed -i "s/#AWS_CLI_DOCKER_TAG=/AWS_CLI_DOCKER_TAG=_AWS_CLI_DOCKER_TAG_/" $WORKINGDIR/.env
                 sed -i "s/#AWS_VOLUME_SIZE=/AWS_VOLUME_SIZE=50/" $WORKINGDIR/.env
                 sed -i "s/#OPENVIDU_PRO_AWS_REGION=/OPENVIDU_PRO_AWS_REGION=${AWS::Region}/" $WORKINGDIR/.env
 
@@ -657,7 +657,7 @@ Resources:
             '/usr/local/bin/getSecurityGroupKms.sh':
               content: !Sub |
                 #!/bin/bash -x
-                docker run --rm amazon/aws-cli:AWS_CLI_DOCKER_TAG ec2 describe-security-groups \
+                docker run --rm amazon/aws-cli:_AWS_CLI_DOCKER_TAG_ ec2 describe-security-groups \
                                 --region ${AWS::Region} \
                                 --output text \
                                 --filters "Name=tag:aws:cloudformation:logical-id,Values=KMSSecurityGroup" \
diff --git a/openvidu-server/deployments/pro/aws/createAMI.sh b/openvidu-server/deployments/pro/aws/createAMI.sh
index 953d197e..7e9454f9 100755
--- a/openvidu-server/deployments/pro/aws/createAMI.sh
+++ b/openvidu-server/deployments/pro/aws/createAMI.sh
@@ -184,7 +184,7 @@ fi
 # Updating the template
 sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu-Pro.yaml.template >CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml
 sed -i "s/KMS_AMI_ID/${KMS_RAW_AMI_ID}/g" CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml
-sed -i "s/AWS_CLI_DOCKER_TAG/${AWS_CLI_DOCKER_TAG}/g" CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml
+sed -i "s/_AWS_CLI_DOCKER_TAG_/${AWS_CLI_DOCKER_TAG}/g" CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml
 
 # Update CF template
 if [[ ${UPDATE_S3_FILES} == "true" ]]; then