diff --git a/cloudformation/antmedia-aws-autoscale-template.yaml b/cloudformation/antmedia-aws-autoscale-template.yaml
index 744d747f..6c46c9a1 100644
--- a/cloudformation/antmedia-aws-autoscale-template.yaml
+++ b/cloudformation/antmedia-aws-autoscale-template.yaml
@@ -143,6 +143,25 @@ Parameters:
       - r3.2xlarge
       - r3.4xlarge
       - r3.8xlarge
+      - p2.xlarge
+      - p2.8xlarge
+      - p2.16xlarge
+      - p3.2xlarge
+      - p3.8xlarge
+      - p3.16xlarge
+      - p3dn.24xlarge
+      - g4dn.xlarge
+      - g4dn.2xlarge
+      - g4dn.4xlarge
+      - g4dn.8xlarge
+      - g4dn.12xlarge
+      - g4dn.16xlarge
+      - g5.xlarge
+      - g5.2xlarge
+      - g5.4xlarge
+      - g5.8xlarge
+      - g5.12xlarge
+      - g5.16xlarge 
     ConstraintDescription: must be a valid EC2 instance type.
 
   MongoDBInstanceType:
@@ -232,11 +251,22 @@ Parameters:
     Type: String
     Default: ''
   DiskSize:
-    Default: '10'
+    Default: '16'
     Description: Disk size of instances
     Type: Number
-    MinValue: '10'
+    MinValue: '16'
     MaxValue: '1000'
+  GPUImage: 
+    Description: Select "true" to use GPU Image in Origin Cluster. You must select one of the g and p instance types.
+    Default: false
+    Type: String
+    AllowedValues: 
+      - true
+      - false
+Conditions:
+  UseGPUImage: !Equals 
+    - !Ref GPUImage
+    - true
 
 Resources:
   DescribeImagesRole:
@@ -336,6 +366,15 @@ Resources:
       Name: "AntMedia-AWS-Marketplace-EE-*"
       Architecture: "x86_64"
 
+  AntMediaGPUAmi:
+    Condition: UseGPUImage
+    Type: Custom::FindAMI
+    Properties:
+      ServiceToken: !Sub ${AMSGetLatestAMI.Arn}
+      ProductId: "8kf9kapq2qbo37fuekp8k7o6r"
+      Name: "AntMedia-AWS-Marketplace-GPU-*"
+      Architecture: "x86_64"   
+
   UbuntuAmi:
     Type: Custom::FindAMI
     Properties:
@@ -518,7 +557,7 @@ Resources:
       LaunchTemplateData:
         InstanceType: !Ref OriginInstanceType
         KeyName: !Ref KeyName
-        ImageId: !Ref AntMediaAmi
+        ImageId: !If [UseGPUImage, !Ref AntMediaGPUAmi, !Ref AntMediaAmi]
         SecurityGroupIds:
           - !GetAtt "InstanceSecurityGroup.GroupId"
         BlockDeviceMappings: