diff --git a/openvidu-deployment/community/singlenode/aws/cf-openvidu-singlenode.yaml b/openvidu-deployment/community/singlenode/aws/cf-openvidu-singlenode.yaml
index 47d27f7c..01070ff2 100644
--- a/openvidu-deployment/community/singlenode/aws/cf-openvidu-singlenode.yaml
+++ b/openvidu-deployment/community/singlenode/aws/cf-openvidu-singlenode.yaml
@@ -204,10 +204,6 @@ Parameters:
 Metadata:
   'AWS::CloudFormation::Interface':
     ParameterGroups:
-      - Label:
-          default: SSH Access configuration
-        Parameters:
-          - KeyName
       - Label:
           default: Domain and SSL certificate configuration
         Parameters:
@@ -220,6 +216,7 @@ Metadata:
           default: EC2 Instance configuration
         Parameters:
           - InstanceType
+          - KeyName
           - AmiId
       - Label:
           default: S3 bucket for application data and recordings
diff --git a/openvidu-deployment/pro/elastic/aws/cf-openvidu-elastic.yaml b/openvidu-deployment/pro/elastic/aws/cf-openvidu-elastic.yaml
index 064dae2a..2b093163 100644
--- a/openvidu-deployment/pro/elastic/aws/cf-openvidu-elastic.yaml
+++ b/openvidu-deployment/pro/elastic/aws/cf-openvidu-elastic.yaml
@@ -382,15 +382,6 @@ Parameters:
 Metadata:
   'AWS::CloudFormation::Interface':
     ParameterGroups:
-      - Label:
-          default: SSH Access configuration
-        Parameters:
-          - KeyName
-      - Label:
-          default: OpenVidu Elastic configuration
-        Parameters:
-          - OpenViduLicense
-          - RTCEngine
       - Label:
           default: Domain and SSL certificate configuration
         Parameters:
@@ -399,11 +390,17 @@ Metadata:
           - DomainName
           - OwnPublicCertificate
           - OwnPrivateCertificate
+      - Label:
+          default: OpenVidu Elastic configuration
+        Parameters:
+          - OpenViduLicense
+          - RTCEngine
       - Label:
           default: EC2 Instance configuration
         Parameters:
           - MasterNodeInstanceType
           - MediaNodeInstanceType
+          - KeyName
           - AmiId
       - Label:
           default: Media Nodes Autoscaling Group configuration
diff --git a/openvidu-deployment/pro/singlenode/aws/cf-openvidu-singlenode.yaml b/openvidu-deployment/pro/singlenode/aws/cf-openvidu-singlenode.yaml
index 6dde6fd0..19f54a62 100644
--- a/openvidu-deployment/pro/singlenode/aws/cf-openvidu-singlenode.yaml
+++ b/openvidu-deployment/pro/singlenode/aws/cf-openvidu-singlenode.yaml
@@ -219,15 +219,6 @@ Parameters:
 Metadata:
   'AWS::CloudFormation::Interface':
     ParameterGroups:
-      - Label:
-          default: SSH Access configuration
-        Parameters:
-          - KeyName
-      - Label:
-          default: OpenVidu Single Node PRO configuration
-        Parameters:
-          - OpenViduLicense
-          - RTCEngine
       - Label:
           default: Domain and SSL certificate configuration
         Parameters:
@@ -236,10 +227,16 @@ Metadata:
           - DomainName
           - OwnPublicCertificate
           - OwnPrivateCertificate
+      - Label:
+          default: OpenVidu Single Node PRO configuration
+        Parameters:
+          - OpenViduLicense
+          - RTCEngine
       - Label:
           default: EC2 Instance configuration
         Parameters:
           - InstanceType
+          - KeyName
           - AmiId
       - Label:
           default: S3 bucket for application data and recordings