diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template
index 0fe8bc7..d0a6dae 100644
--- a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template
+++ b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template
@@ -73,8 +73,9 @@
         "SyncGatewayVersion": {
             "Description": "Couchbase Sync Gateway Version",
             "Type": "String",
-            "Default": "3.0.4",
+            "Default": "3.0.5",
             "AllowedValues": [
+                "3.0.5",
                 "3.0.4",
                 "3.0.3",
                 "2.8.3",
diff --git a/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template
index 57bceae..207964b 100644
--- a/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template
+++ b/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template
@@ -76,8 +76,9 @@
         "SyncGatewayVersion": {
             "Description": "Couchbase Sync Gateway Version",
             "Type": "String",
-            "Default": "3.0.4",
+            "Default": "3.0.5",
             "AllowedValues": [
+                "3.0.5",
                 "3.0.4",
                 "3.0.3",
                 "2.8.3",
diff --git a/aws/CouchbaseSyncGateway/mappings.json b/aws/CouchbaseSyncGateway/mappings.json
index 5afa078..fec5de1 100644
--- a/aws/CouchbaseSyncGateway/mappings.json
+++ b/aws/CouchbaseSyncGateway/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseSyncGateway": {
         "ap-northeast-1": {
-            "AMI": "ami-0435db90a1de2faba"
+            "AMI": "ami-098b61e872ec9c4a5"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0138ae047887632dd"
+            "AMI": "ami-05d81037e9e7e3469"
         },
         "ap-south-1": {
-            "AMI": "ami-044cd5a53bf731df8"
+            "AMI": "ami-0d05c40dd35dbab22"
         },
         "ap-southeast-1": {
-            "AMI": "ami-070ca616f340b9643"
+            "AMI": "ami-0ffbe780887a527be"
         },
         "ap-southeast-2": {
-            "AMI": "ami-041213cac76e6e5bd"
+            "AMI": "ami-0d0aef0188c3500ee"
         },
         "ca-central-1": {
-            "AMI": "ami-05afb53414c51fbe0"
+            "AMI": "ami-0bcf614070b977409"
         },
         "eu-central-1": {
-            "AMI": "ami-0efecccc6b00d3f5f"
+            "AMI": "ami-00a912a9071f8c8c2"
         },
         "eu-west-1": {
-            "AMI": "ami-0450ba6bc7403343d"
+            "AMI": "ami-0affd91c45636a91f"
         },
         "eu-west-2": {
-            "AMI": "ami-09392c5427a69a4db"
+            "AMI": "ami-0f2fbd753144bed78"
         },
         "eu-west-3": {
-            "AMI": "ami-066e907b14aeb9728"
+            "AMI": "ami-00d3a2fc678c3193e"
         },
         "sa-east-1": {
-            "AMI": "ami-03a65461a3b3be932"
+            "AMI": "ami-092a972aa8afe2982"
         },
         "us-east-1": {
-            "AMI": "ami-0ffc6b8afafff174a"
+            "AMI": "ami-07c3349c35f179498"
         },
         "us-east-2": {
-            "AMI": "ami-0ce8185380464a735"
+            "AMI": "ami-038c73d98d4cd654d"
         },
         "us-west-1": {
-            "AMI": "ami-04475860d565d5a1f"
+            "AMI": "ami-07ec4dae6e4f68ac2"
         },
         "us-west-2": {
-            "AMI": "ami-0e631bb60a6244545"
+            "AMI": "ami-04f61679f6fc9eee9"
         }
     }
 }
diff --git a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
index 6f6093f..335c1a8 100644
--- a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
+++ b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
@@ -562,10 +562,14 @@
             "name": "syncGatewayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Sync Gateway Version",
-            "defaultValue": "3.0.4",
+            "defaultValue": "3.0.5",
             "toolTip": "Sync Gateway Version",
             "constraints": {
               "allowedValues": [
+                {
+                  "label": "3.0.5",
+                  "value": "3.0.5"
+                },
                 {
                   "label": "3.0.4",
                   "value": "3.0.4"
diff --git a/azure/CouchbaseSyncGateway-Application/createUiDefinition.Unlicensed.json b/azure/CouchbaseSyncGateway-Application/createUiDefinition.Unlicensed.json
index 60717ed..89e438e 100644
--- a/azure/CouchbaseSyncGateway-Application/createUiDefinition.Unlicensed.json
+++ b/azure/CouchbaseSyncGateway-Application/createUiDefinition.Unlicensed.json
@@ -296,10 +296,14 @@
             "name": "syncGatewayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Sync Gateway Version",
-            "defaultValue": "3.0.4",
+            "defaultValue": "3.0.5",
             "toolTip": "Sync Gateway Version",
             "constraints": {
               "allowedValues": [
+                {
+                  "label": "3.0.5",
+                  "value": "3.0.5"
+                },
                 {
                   "label": "3.0.4",
                   "value": "3.0.4"
diff --git a/azure/CouchbaseSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseSyncGateway-Application/createUiDefinition.json
index 6303671..ea88d04 100644
--- a/azure/CouchbaseSyncGateway-Application/createUiDefinition.json
+++ b/azure/CouchbaseSyncGateway-Application/createUiDefinition.json
@@ -277,10 +277,14 @@
             "name": "syncGatewayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Sync Gateway Version",
-            "defaultValue": "3.0.4",
+            "defaultValue": "3.0.5",
             "toolTip": "Sync Gateway Version",
             "constraints": {
               "allowedValues": [
+                {
+                  "label": "3.0.5",
+                  "value": "3.0.5"
+                },
                 {
                   "label": "3.0.4",
                   "value": "3.0.4"
diff --git a/gcp/couchbase-sync-gateway-byol/couchbase.py.schema b/gcp/couchbase-sync-gateway-byol/couchbase.py.schema
index cbdf4cd..5823b2a 100755
--- a/gcp/couchbase-sync-gateway-byol/couchbase.py.schema
+++ b/gcp/couchbase-sync-gateway-byol/couchbase.py.schema
@@ -111,8 +111,9 @@ properties:
     default: 20
   syncGatewayVersion:
     type: string
-    default: 3.0.4
+    default: 3.0.5
     enum:
+      - 3.0.5
       - 3.0.4
       - 3.0.3
       - 2.8.3
diff --git a/gcp/couchbase-sync-gateway-hourly-pricing/couchbase.py.schema b/gcp/couchbase-sync-gateway-hourly-pricing/couchbase.py.schema
index cbdf4cd..5823b2a 100755
--- a/gcp/couchbase-sync-gateway-hourly-pricing/couchbase.py.schema
+++ b/gcp/couchbase-sync-gateway-hourly-pricing/couchbase.py.schema
@@ -111,8 +111,9 @@ properties:
     default: 20
   syncGatewayVersion:
     type: string
-    default: 3.0.4
+    default: 3.0.5
     enum:
+      - 3.0.5
       - 3.0.4
       - 3.0.3
       - 2.8.3
diff --git a/gcp/couchbase-sync-gateway/couchbase.py.schema b/gcp/couchbase-sync-gateway/couchbase.py.schema
index 86edb95..f4cf9e0 100755
--- a/gcp/couchbase-sync-gateway/couchbase.py.schema
+++ b/gcp/couchbase-sync-gateway/couchbase.py.schema
@@ -66,8 +66,9 @@ properties:
     default: 20
   serverVersion:
     type: string
-    default: 3.0.4
+    default: 3.0.5
     enum:
+      - 3.0.5
       - 3.0.4
       - 3.0.3
       - 2.8.3
diff --git a/gcp/couchbase-sync-gateway/resources/instance_template.py.schema b/gcp/couchbase-sync-gateway/resources/instance_template.py.schema
index 8396457..4e937d4 100644
--- a/gcp/couchbase-sync-gateway/resources/instance_template.py.schema
+++ b/gcp/couchbase-sync-gateway/resources/instance_template.py.schema
@@ -9,8 +9,9 @@ properties:
     default: default
   serverVersion:
     type: string
-    default: 3.0.4
+    default: 3.0.5
     enum:
+      - 3.0.5
       - 3.0.4
       - 3.0.3
       - 2.8.3
diff --git a/gcp/couchbase-sync-gateway/test_config.local.yaml b/gcp/couchbase-sync-gateway/test_config.local.yaml
index dbff5e6..96927f7 100644
--- a/gcp/couchbase-sync-gateway/test_config.local.yaml
+++ b/gcp/couchbase-sync-gateway/test_config.local.yaml
@@ -10,7 +10,7 @@ resources:
       serverNodeCount: 3
       serverNodeType: n1-standard-4
       serverDiskSize: 20
-      serverVersion: 3.0.3
+      serverVersion: 3.0.5
       username: 'couchbase'
       password: 'foo123!'
       accessCIDR: 0.0.0.0/0
diff --git a/gcp/couchbase-sync-gateway/test_config.yaml b/gcp/couchbase-sync-gateway/test_config.yaml
index 87bf0b4..66c5213 100644
--- a/gcp/couchbase-sync-gateway/test_config.yaml
+++ b/gcp/couchbase-sync-gateway/test_config.yaml
@@ -10,7 +10,7 @@ resources:
       serverNodeCount: 3
       serverNodeType: n1-standard-4
       serverDiskSize: 20
-      serverVersion: 3.0.3
+      serverVersion: 3.0.5
       username: 'couchbase'
       password: 'foo123!'
       accessCIDR: 0.0.0.0/0
diff --git a/gcp/shared/group.py.schema b/gcp/shared/group.py.schema
index af023c5..16c6050 100644
--- a/gcp/shared/group.py.schema
+++ b/gcp/shared/group.py.schema
@@ -49,8 +49,9 @@ properties:
       - 6.0.0
   syncGatewayVersion:
     type: string
-    default: 3.0.4
+    default: 3.0.5
     enum:
+      - 3.0.5
       - 3.0.4
       - 3.0.3
       - 2.8.2