diff --git a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template
index 7a1baf28..05ac45b6 100644
--- a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template
+++ b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template
@@ -272,6 +272,10 @@ Resources:
 
                 # Restart all services
                 pushd /opt/openvidu
+                docker-compose up -d kms
+                until docker-compose ps | grep kms | grep healthy; do
+                    echo "Waiting kms..."
+                done
                 docker-compose up -d
                 popd
               mode: "000755"
@@ -306,6 +310,10 @@ Resources:
 
           # Start openvidu application
           pushd /opt/openvidu
+          docker-compose up -d kms
+          until docker-compose ps | grep kms | grep healthy; do
+              echo "Waiting kms..."
+          done
           docker-compose up -d
           popd