diff --git a/snippets/snippets.json b/snippets/snippets.json
index faf3a69..ba1f322 100644
--- a/snippets/snippets.json
+++ b/snippets/snippets.json
@@ -649,7 +649,7 @@
 	},
 	"s3-bucket": {
 		"prefix": "s3-bucket",
-		"body": "\r\n\"${1:s3Bucket}\": {\r\n\t\"Type\": \"AWS::S3::Bucket\",\r\n\t\"Properties\": {\r\n\t\t\"AccessControl\": \"${2:Private | PublicRead | PublicReadWrite | AuthenticatedRead | LogDeliveryWrite | BucketOwnerRead | BucketOwnerFullControl}\",\r\n\t\t\"BucketName\": \"${3}\",\r\n\t\t\"CorsConfiguration\": {${4}},\r\n\t\t\"LifecycleConfiguration\": {${5}},\r\n\t\t\"NotificationConfiguration\": {${6}},\r\n\t\t\"VersioningConfiguration\": {${7}},\r\n\t\t\"WebsiteConfiguration\": {${8}},\r\n\t\t\"Tags\": [${9}] \r\n\t}\r\n}\r\n",
+		"body": "\r\n\"${1:s3Bucket}\": {\r\n\t\"Type\": \"AWS::S3::Bucket\",\r\n\t\"Properties\": {\r\n\t\t\"AccelerateConfiguration\": {${1}},\r\n\t\t\"AccessControl\": \"${2:Private | PublicRead | PublicReadWrite | AuthenticatedRead | LogDeliveryWrite | BucketOwnerRead | BucketOwnerFullControl}\",\r\n\t\t\"AnalyticsConfigurations\": [${3}],\r\n\t\t\"BucketEncryption\": {${4}},\r\n\t\t\"BucketName\": \"${5}\",\r\n\t\t\"CorsConfiguration\": {${6}},\r\n\t\t\"InventoryConfigurations\": [${7}],\r\n\t\t\"LifecycleConfiguration\": {${8}},\r\n\t\t\"LoggingConfiguration\": {${9}},\r\n\t\t\"MetricsConfigurations\": [${10}],\r\n\t\t\"NotificationConfiguration\": {${11}},\r\n\t\t\"ObjectLockConfiguration\": {${12}},\r\n\t\t\"ObjectLockEnabled\": ${13},\r\n\t\t\"PublicAccessBlockConfiguration\": {${14}},\r\n\t\t\"ReplicationConfiguration\": {${15}},\r\n\t\t\"VersioningConfiguration\": {${16}},\r\n\t\t\"WebsiteConfiguration\": {${17}},\r\n\t\t\"Tags\": [${18}] \r\n\t}\r\n}\r\n",
 		"description": "",
 		"scope": "source.cloudformation"
 	},
diff --git a/snippets/yaml-snippets.json b/snippets/yaml-snippets.json
index 3c10a8c..e2cbb2e 100644
--- a/snippets/yaml-snippets.json
+++ b/snippets/yaml-snippets.json
@@ -375,14 +375,14 @@
 			"    AssumeRolePolicyDocument: ",
 			"    Policies:",
 			"      - ",
-			"       PolicyName: \"root\"",
-			"       PolicyDocument:",
-			"         Version: \"2012-10-17\"",
-			"         Statement:",
-			"            - ",
-			"              Effect: \"Allow\"",
-			"              Action: \"*\"",
-			"              Resource: \"*\""
+			"        PolicyName: \"root\"",
+			"        PolicyDocument:",
+			"          Version: \"2012-10-17\"",
+			"          Statement:",
+			"             - ",
+			"               Effect: \"Allow\"",
+			"               Action: \"*\"",
+			"               Resource: \"*\""
 		],
 		"description": "",
 		"scope": "source.cloudformation"
@@ -1214,16 +1214,29 @@
 			"${1:s3Bucket}:",
 			"  Type: AWS::S3::Bucket",
 			"  Properties: ",
+			"    AccelerateConfiguration:",
+			"		 	 AccelerationStatus: ${1}",
 			"    AccessControl: ${2:Private | PublicRead | PublicReadWrite | AuthenticatedRead | LogDeliveryWrite | BucketOwnerRead | BucketOwnerFullControl}",
-			"    BucketName: ${3}",
-			"    CorsConfiguration: ${4}",
-			"    LifecycleConfiguration: ${5}",
-			"    NotificationConfiguration: ${6}",
-			"    VersioningConfiguration: ${7}",
-			"    WebsiteConfiguration: ${8}",
+			"    AnalyticsConfigurations: ${3}",
+			"    BucketEncryption: ${4}",
+			"    BucketName: ${5}",
+			"    CorsConfiguration: ${6}",
+			"    InventoryConfigurations:",
+			"      - ${7}",
+			"    LifecycleConfiguration: ${8}",
+			"    LoggingConfiguration: ${9}",
+			"    MetricsConfigurations:",
+			"      - ${10}",
+			"    NotificationConfiguration: ${11}",
+			"    ObjectLockConfiguration: ${12}",
+			"    ObjectLockEnabled: ${13}",
+			"    PublicAccessBlockConfiguration: ${14}",
+			"    ReplicationConfiguration: ${15}",
+			"    VersioningConfiguration: ${16}",
+			"    WebsiteConfiguration: ${17}",
 			"    Tags:",
-			"      - Key: ${9:key}",
-			"        Value: ${10:value}"
+			"      - Key: ${18:key}",
+			"        Value: ${19:value}"
 		],
 		"description": "",
 		"scope": "source.cloudformation"