diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh
index 0a25a6f7..edb8b2b8 100755
--- a/openvidu-server/deployments/ce/aws/createAMI.sh
+++ b/openvidu-server/deployments/ce/aws/createAMI.sh
@@ -71,7 +71,7 @@ fi
 aws cloudformation create-stack \
   --stack-name openvidu-ce-${DATESTAMP} \
   --template-url ${TEMPLATE_URL} \
-  --disable-rollback
+  "$(if [ "$NIGHTLY" == "false" ]; then echo '--disable-rollback'; fi)"
 
 aws cloudformation wait stack-create-complete --stack-name openvidu-ce-${DATESTAMP}
 
diff --git a/openvidu-server/deployments/pro/aws/createAMIs.sh b/openvidu-server/deployments/pro/aws/createAMIs.sh
index 113d46c7..71537b1b 100755
--- a/openvidu-server/deployments/pro/aws/createAMIs.sh
+++ b/openvidu-server/deployments/pro/aws/createAMIs.sh
@@ -80,7 +80,7 @@ fi
 aws cloudformation create-stack \
   --stack-name kms-${DATESTAMP} \
   --template-url ${TEMPLATE_URL} \
-  --disable-rollback
+  "$(if [ "$NIGHTLY" == "false" ]; then echo '--disable-rollback'; fi)"
 
 aws cloudformation wait stack-create-complete --stack-name kms-${DATESTAMP}
 
@@ -123,7 +123,7 @@ fi
 aws cloudformation create-stack \
   --stack-name openvidu-${DATESTAMP} \
   --template-url ${TEMPLATE_URL} \
-  --disable-rollback
+  "$(if [ "$NIGHTLY" == "false" ]; then echo '--disable-rollback'; fi)"
 
 aws cloudformation wait stack-create-complete --stack-name openvidu-${DATESTAMP}