diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-byol-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-byol-amzn-lnx2.template
index 14da3dc..232b071 100644
--- a/aws/CouchbaseServerAndSyncGateway/couchbase-byol-amzn-lnx2.template
+++ b/aws/CouchbaseServerAndSyncGateway/couchbase-byol-amzn-lnx2.template
@@ -115,6 +115,7 @@
           "AllowedValues": [
               "6.6.1",
               "6.6.0",
+              "6.5.2",
               "6.5.1",
               "6.5.0",
               "6.0.4",
@@ -263,7 +264,7 @@
           "Type": "AWS::EC2::KeyPair::KeyName"
       },
       "SSHCIDR": {
-          "Description": "SSH CIDR",
+          "Description": "Range of IP addresses for accessing servers via SSH",
           "Type": "String",
           "MinLength": 9,
           "MaxLength": 18,
diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-hourlypricing-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-hourlypricing-amzn-lnx2.template
index afab5c6..0b9ab01 100644
--- a/aws/CouchbaseServerAndSyncGateway/couchbase-hourlypricing-amzn-lnx2.template
+++ b/aws/CouchbaseServerAndSyncGateway/couchbase-hourlypricing-amzn-lnx2.template
@@ -112,6 +112,7 @@
           "AllowedValues": [
               "6.6.1",
               "6.6.0",
+              "6.5.2",
               "6.5.1",
               "6.5.0",
               "6.0.4",
@@ -260,7 +261,7 @@
           "Type": "AWS::EC2::KeyPair::KeyName"
       },
       "SSHCIDR": {
-          "Description": "SSH CIDR",
+          "Description": "Range of IP addresses for accessing servers via SSH",
           "Type": "String",
           "MinLength": 9,
           "MaxLength": 18,
diff --git a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
index 091d5c7..90986fb 100644
--- a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
+++ b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
@@ -278,7 +278,11 @@
                 {
                   "label": "6.6.0",
                   "value": "6.6.0"
-                },   
+                },
+                {
+                  "label": "6.5.2",
+                  "value": "6.5.2"
+                },    
                 {
                   "label": "6.5.1",
                   "value": "6.5.1"
@@ -306,51 +310,7 @@
                 {
                   "label": "6.0.0",
                   "value": "6.0.0"
-                },                
-                {
-                  "label": "5.5.4",
-                  "value": "5.5.4"
-                },                
-                {
-                  "label": "5.5.3",
-                  "value": "5.5.3"
-                },                
-                {
-                  "label": "5.5.2",
-                  "value": "5.5.2"
-                },                
-                {
-                  "label": "5.5.1",
-                  "value": "5.5.1"
-                },                
-                {
-                  "label": "5.5.0",
-                  "value": "5.5.0"
-                },                
-                {
-                  "label": "5.1.3",
-                  "value": "5.1.3"
-                },                
-                {
-                  "label": "5.1.2",
-                  "value": "5.1.2"
-                },                
-                {
-                  "label": "5.1.1",
-                  "value": "5.1.1"
-                },                
-                {
-                  "label": "5.1.0",
-                  "value": "5.1.0"
-                },                
-                {
-                  "label": "5.0.1",
-                  "value": "5.0.1"
-                },                
-                {
-                  "label": "5.0.0",
-                  "value": "5.0.0"
-                }                
+                }               
               ]
             }
           },
@@ -358,7 +318,7 @@
             "name": "syncGatewayNodeCount",
             "type": "Microsoft.Common.DropDown",
             "label": "Sync Gateway Node Count",
-            "defaultValue": "2",
+            "defaultValue": "0",
             "toolTip": "Number of virtual machines to provision for Sync Gateway cluster",
             "constraints": {
               "allowedValues": [
@@ -564,10 +524,6 @@
                 {
                   "label": "1.5.2",
                   "value": "1.5.2"
-                },
-                {
-                  "label": "1.5.1",
-                  "value": "1.5.1"
                 }
               ]
             }
diff --git a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema
index 1f4e596..1bc784e 100755
--- a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema
+++ b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema
@@ -80,29 +80,18 @@ properties:
     enum:
       - 6.6.1
       - 6.6.0
+      - 6.5.2
       - 6.5.1
       - 6.5.0
       - 6.0.4
       - 6.0.3
       - 6.0.2
       - 6.0.1
-      - 5.5.6
-      - 5.5.5
-      - 5.5.4
-      - 5.5.3
-      - 5.5.2
-      - 5.5.1
-      - 5.5.0
-      - 5.1.3
-      - 5.1.2
-      - 5.1.1
-      - 5.1.0
-      - 5.0.1
-      - 5.0.0
+      - 6.0.0
 
   syncGatewayNodeCount:
     type: integer
-    default: 2
+    default: 0
     minimum: 0
     maximum: 100
   syncGatewayNodeType:
diff --git a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema
index 1f4e596..1bc784e 100755
--- a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema
+++ b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema
@@ -80,29 +80,18 @@ properties:
     enum:
       - 6.6.1
       - 6.6.0
+      - 6.5.2
       - 6.5.1
       - 6.5.0
       - 6.0.4
       - 6.0.3
       - 6.0.2
       - 6.0.1
-      - 5.5.6
-      - 5.5.5
-      - 5.5.4
-      - 5.5.3
-      - 5.5.2
-      - 5.5.1
-      - 5.5.0
-      - 5.1.3
-      - 5.1.2
-      - 5.1.1
-      - 5.1.0
-      - 5.0.1
-      - 5.0.0
+      - 6.0.0
 
   syncGatewayNodeCount:
     type: integer
-    default: 2
+    default: 0
     minimum: 0
     maximum: 100
   syncGatewayNodeType: