diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh
index 1091e351..9861e238 100755
--- a/openvidu-server/deployments/ce/aws/createAMI.sh
+++ b/openvidu-server/deployments/ce/aws/createAMI.sh
@@ -4,9 +4,9 @@ set -eu -o pipefail
 CF_RELEASE=${CF_RELEASE:-false}
 AWS_KEY_NAME=${AWS_KEY_NAME:-}
 
-# if [[ $CF_RELEASE == "true" ]]; then
-#   git checkout v$OPENVIDU_VERSION
-# fi
+if [[ $CF_RELEASE == "true" ]]; then
+  git checkout v$OPENVIDU_VERSION
+fi
 
 export AWS_DEFAULT_REGION=eu-west-1
 
@@ -89,7 +89,7 @@ aws cloudformation delete-stack --stack-name openvidu-ce-${DATESTAMP}
 # Wait for the instance
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
-WAIT_MAX_RETRIES=3
+WAIT_MAX_RETRIES=5
 until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
   WAIT_RETRIES=$((WAIT_RETRIES + 1))
diff --git a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template
index 71695eed..57cf75ee 100644
--- a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template
+++ b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template
@@ -123,7 +123,7 @@ Resources:
               mode: "000755"
               owner: "root"
               group: "root"
-            '/usr/local/bin/openvidu-init.sh':
+            "/usr/local/bin/openvidu-init.sh":
               content: |
                 #!/bin/bash -x
 
diff --git a/openvidu-server/deployments/enterprise/aws/createAMI.sh b/openvidu-server/deployments/enterprise/aws/createAMI.sh
index d793df1f..172111a6 100755
--- a/openvidu-server/deployments/enterprise/aws/createAMI.sh
+++ b/openvidu-server/deployments/enterprise/aws/createAMI.sh
@@ -5,9 +5,9 @@ AWS_KEY_NAME=${AWS_KEY_NAME:-}
 CF_RELEASE=${CF_RELEASE:-false}
 KMS_AMI_ID=${KMS_AMI_ID:-}
 
-# if [[ $CF_RELEASE == "true" ]]; then
-#   git checkout v$OPENVIDU_PRO_VERSION
-# fi
+if [[ $CF_RELEASE == "true" ]]; then
+  git checkout v$OPENVIDU_PRO_VERSION
+fi
 
 export AWS_DEFAULT_REGION=eu-west-1
 
@@ -93,7 +93,7 @@ echo "Create AMI with ID: ${OV_RAW_AMI_ID}"
 # Wait for the instance
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
-WAIT_MAX_RETRIES=3
+WAIT_MAX_RETRIES=5
 until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
   WAIT_RETRIES=$((WAIT_RETRIES + 1))
diff --git a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
index cf8d4fd7..df1740cc 100755
--- a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
+++ b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh
@@ -4,9 +4,9 @@ set -eu -o pipefail
 AWS_KEY_NAME=${AWS_KEY_NAME:-}
 CF_RELEASE=${CF_RELEASE:-false}
 
-# if [[ $CF_RELEASE == "true" ]]; then
-#   git checkout v$OPENVIDU_PRO_VERSION
-# fi
+if [[ $CF_RELEASE == "true" ]]; then
+  git checkout v$OPENVIDU_PRO_VERSION
+fi
 
 export AWS_DEFAULT_REGION=eu-west-1
 
@@ -77,7 +77,7 @@ echo "Create AMI with ID: ${OV_RAW_AMI_ID}"
 # Wait for the instance
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
-WAIT_MAX_RETRIES=3
+WAIT_MAX_RETRIES=5
 until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
   WAIT_RETRIES=$((WAIT_RETRIES + 1))
diff --git a/openvidu-server/deployments/pro/aws/createAMI.sh b/openvidu-server/deployments/pro/aws/createAMI.sh
index 4fb7d868..953d197e 100755
--- a/openvidu-server/deployments/pro/aws/createAMI.sh
+++ b/openvidu-server/deployments/pro/aws/createAMI.sh
@@ -11,9 +11,9 @@ fi
 CF_RELEASE=${CF_RELEASE:-false}
 AWS_KEY_NAME=${AWS_KEY_NAME:-}
 
-# if [[ $CF_RELEASE == "true" ]]; then
-#   git checkout v$OPENVIDU_PRO_VERSION
-# fi
+if [[ $CF_RELEASE == "true" ]]; then
+  git checkout v$OPENVIDU_PRO_VERSION
+fi
 
 export AWS_DEFAULT_REGION=eu-west-1
 
@@ -107,7 +107,7 @@ aws cloudformation delete-stack --stack-name kms-${DATESTAMP}
 # Wait for the instance
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
-WAIT_MAX_RETRIES=3
+WAIT_MAX_RETRIES=5
 until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
   aws ec2 wait image-available --image-ids ${KMS_RAW_AMI_ID} && break
   WAIT_RETRIES=$((WAIT_RETRIES + 1))
@@ -167,7 +167,7 @@ aws cloudformation delete-stack --stack-name openvidu-${DATESTAMP}
 # Wait for the instance
 # Unfortunately, aws cli does not have a way to increase timeout
 WAIT_RETRIES=0
-WAIT_MAX_RETRIES=3
+WAIT_MAX_RETRIES=5
 until [ "${WAIT_RETRIES}" -ge "${WAIT_MAX_RETRIES}" ]; do
   aws ec2 wait image-available --image-ids ${OV_RAW_AMI_ID} && break
   WAIT_RETRIES=$((WAIT_RETRIES + 1))