diff --git a/.doc_gen/metadata/api_gateway_apigateway_lambda_metadata.yaml b/.doc_gen/metadata/api_gateway_apigateway_lambda_metadata.yaml
new file mode 100644
index 0000000..73beb53
--- /dev/null
+++ b/.doc_gen/metadata/api_gateway_apigateway_lambda_metadata.yaml
@@ -0,0 +1,26 @@
+api_gateway_GettingStarted_087:
+  title: Create a REST API with Lambda proxy integration
+  title_abbrev: Create a REST API with Lambda proxy integration
+  synopsis_list:
+    - Create an IAM role for Lambda execution
+    - Create and deploy a Lambda function
+    - Create a REST API
+    - Configure Lambda proxy integration
+    - Deploy and test the API
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/087-apigateway-lambda-integration
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/087-apigateway-lambda-integration/apigateway-lambda-integration.sh
+  services:
+    api-gateway: {CreateDeployment, CreateResource, CreateRestApi, DeleteRestApi, GetResources, GetRestApis, PutIntegration, PutMethod}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy}
+    lambda: {AddPermission, CreateFunction, DeleteFunction}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/athena_amazon_athena_metadata.yaml b/.doc_gen/metadata/athena_amazon_athena_metadata.yaml
new file mode 100644
index 0000000..3bf81f3
--- /dev/null
+++ b/.doc_gen/metadata/athena_amazon_athena_metadata.yaml
@@ -0,0 +1,24 @@
+athena_GettingStarted_061:
+  title: Getting started with Amazon Athena
+  title_abbrev: Getting started with Amazon Athena
+  synopsis_list:
+    - Create an S3 bucket for query results
+    - Create a database
+    - Create a table
+    - Run a query
+    - Create and use named queries
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/061-amazon-athena-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/061-amazon-athena-gs/amazon-athena-gs.sh
+  services:
+    athena: {CreateNamedQuery, DeleteNamedQuery, GetNamedQuery, GetQueryExecution, GetQueryResults, ListDatabases, ListNamedQueries, ListTableMetadata, StartQueryExecution}
+    s3: {Cp, Mb, Rb, Rm}
diff --git a/.doc_gen/metadata/cloudformation_cloudformation_gs_metadata.yaml b/.doc_gen/metadata/cloudformation_cloudformation_gs_metadata.yaml
new file mode 100644
index 0000000..108d6a8
--- /dev/null
+++ b/.doc_gen/metadata/cloudformation_cloudformation_gs_metadata.yaml
@@ -0,0 +1,20 @@
+cloudformation_GettingStarted_021:
+  title: Creating your first CloudFormation stack
+  title_abbrev: Creating your first CloudFormation stack
+  synopsis_list:
+    - Create a CloudFormation template
+    - Test the web server
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/021-cloudformation-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/021-cloudformation-gs/cloudformation-gs.sh
+  services:
+    cloudformation: {CreateStack, DeleteStack, DescribeStacks, ListStackResources, ValidateTemplate, Wait}
diff --git a/.doc_gen/metadata/cloudfront_metadata.yaml b/.doc_gen/metadata/cloudfront_metadata.yaml
index 3b6e95a..507317d 100644
--- a/.doc_gen/metadata/cloudfront_metadata.yaml
+++ b/.doc_gen/metadata/cloudfront_metadata.yaml
@@ -1,14 +1,11 @@
 cloudfront_GettingStarted:
-  title: Get started with a basic CloudFront distribution using the CLI
-  title_abbrev: Get started with CloudFront
+  title: Get started with a basic CloudFront distribution
+  title_abbrev: Get started with a basic CloudFront distribution
   synopsis_list:
-    - Create an Amazon S3 bucket for content storage
-    - Upload sample content to the S3 bucket
-    - Create an origin access control (OAC) for secure S3 access
-    - Create a CloudFront distribution with S3 as origin
-    - Update S3 bucket policy to allow CloudFront access
-    - Wait for distribution deployment and test content access
-    - Clean up resources including distribution, OAC, and S3 bucket
+    - Create an Amazon S3 bucket
+    - Upload content to the bucket
+    - Create a CloudFront distribution with OAC
+    - Clean up resources
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/cloudmap_metadata.yaml b/.doc_gen/metadata/cloudmap_metadata.yaml
index e2a6bf9..0803f99 100644
--- a/.doc_gen/metadata/cloudmap_metadata.yaml
+++ b/.doc_gen/metadata/cloudmap_metadata.yaml
@@ -1,13 +1,14 @@
 cloudmap_CustomAttributes:
-  title: Use custom attributes with Cloud Map
+  title: Using Cloud Map service discovery with custom attributes
   title_abbrev: Cloud Map custom attributes
   synopsis_list:
-    - Create an HTTP namespace for API-based service discovery
-    - Create a DynamoDB table and register it as a data service with custom attributes
-    - Create Lambda functions for reading and writing data
-    - Register Lambda functions as service instances with custom attributes for action-based discovery
-    - Build client applications that discover services using custom attributes
-    - Clean up all resources including Lambda functions, DynamoDB table, and Cloud Map services
+    - Create an Cloud Map namespace
+    - Create a DynamoDB table
+    - Create an Cloud Map data service and register the DynamoDB table
+    - Create an IAM role for Lambda functions
+    - Create the Lambda function to write data
+    - Create an Cloud Map app service and register the Lambda write function
+    - Create the Lambda function to read data
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/cloudwatch_cloudwatch_dynamicdash_metadata.yaml b/.doc_gen/metadata/cloudwatch_cloudwatch_dynamicdash_metadata.yaml
new file mode 100644
index 0000000..a26e063
--- /dev/null
+++ b/.doc_gen/metadata/cloudwatch_cloudwatch_dynamicdash_metadata.yaml
@@ -0,0 +1,24 @@
+cloudwatch_GettingStarted_031:
+  title: Creating a CloudWatch dashboard with function name as a variable
+  title_abbrev: Creating a CloudWatch dashboard with function name as a variable
+  synopsis_list:
+    - Create a CloudWatch dashboard
+    - Add Lambda metrics widgets with a function name variable
+    - Verify the dashboard
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/031-cloudwatch-dynamicdash
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/031-cloudwatch-dynamicdash/cloudwatch-dynamicdash.sh
+  services:
+    cloudwatch: {DeleteDashboards, GetDashboard, ListDashboards, PutDashboard}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy}
+    lambda: {CreateFunction, DeleteFunction, Invoke, ListFunctions}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/cognito_identity_provider_amazon_cognito_metadata.yaml b/.doc_gen/metadata/cognito_identity_provider_amazon_cognito_metadata.yaml
new file mode 100644
index 0000000..cc3a078
--- /dev/null
+++ b/.doc_gen/metadata/cognito_identity_provider_amazon_cognito_metadata.yaml
@@ -0,0 +1,24 @@
+cognito_identity_provider_GettingStarted_066:
+  title: Getting started with Amazon Cognito user pools
+  title_abbrev: Getting started with Amazon Cognito user pools
+  synopsis_list:
+    - Create a user pool
+    - Create an app client
+    - Set up a domain for your user pool
+    - Create a user as an administrator
+    - Enable self-registration
+    - List users in the user pool
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/066-amazon-cognito-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/066-amazon-cognito-gs/amazon-cognito-gs.sh
+  services:
+    cognito-identity-provider: {AdminConfirmSignUp, AdminCreateUser, CreateUserPool, CreateUserPoolClient, CreateUserPoolDomain, DeleteUserPool, DeleteUserPoolDomain, DescribeUserPool, DescribeUserPoolClient, InitiateAuth, ListUsers, SignUp}
diff --git a/.doc_gen/metadata/config_service_aws_config_metadata.yaml b/.doc_gen/metadata/config_service_aws_config_metadata.yaml
new file mode 100644
index 0000000..5ba06e6
--- /dev/null
+++ b/.doc_gen/metadata/config_service_aws_config_metadata.yaml
@@ -0,0 +1,28 @@
+config_service_GettingStarted_053:
+  title: Getting started with Config
+  title_abbrev: Getting started with Config
+  synopsis_list:
+    - Create an Amazon S3 bucket
+    - Create an Amazon SNS topic
+    - Create an IAM role for Config
+    - Set up the Config configuration recorder
+    - Set up the Config delivery channel
+    - Start the configuration recorder
+    - Verify the Config setup
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/053-aws-config-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/053-aws-config-gs/aws-config-gs.sh
+  services:
+    config-service: {DeleteConfigurationRecorder, DeleteDeliveryChannel, DescribeConfigurationRecorderStatus, DescribeConfigurationRecorders, DescribeDeliveryChannels, PutConfigurationRecorder, PutDeliveryChannel, StartConfigurationRecorder, StopConfigurationRecorder}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DeleteRolePolicy, DetachRolePolicy, PutRolePolicy}
+    s3: {CreateBucket, DeleteBucket, PutPublicAccessBlock, Rm}
+    sns: {CreateTopic, DeleteTopic}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/connect_connect_gs_metadata.yaml b/.doc_gen/metadata/connect_connect_gs_metadata.yaml
new file mode 100644
index 0000000..6399a2e
--- /dev/null
+++ b/.doc_gen/metadata/connect_connect_gs_metadata.yaml
@@ -0,0 +1,22 @@
+connect_GettingStarted_027:
+  title: Creating an Amazon Connect instance
+  title_abbrev: Creating an Amazon Connect instance
+  synopsis_list:
+    - Create an Amazon Connect instance
+    - Configure an administrator user
+    - Configure telephony options
+    - Set up a phone number
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/027-connect-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/027-connect-gs/connect-gs.sh
+  services:
+    connect: {ClaimPhoneNumber, CreateInstance, CreateUser, DeleteInstance, DescribeInstance, ListInstanceStorageConfigs, ListInstances, ListRoutingProfiles, ListSecurityProfiles, ReleasePhoneNumber, SearchAvailablePhoneNumbers, UpdateInstanceAttribute}
diff --git a/.doc_gen/metadata/directconnect_aws_direct_metadata.yaml b/.doc_gen/metadata/directconnect_aws_direct_metadata.yaml
new file mode 100644
index 0000000..08f1945
--- /dev/null
+++ b/.doc_gen/metadata/directconnect_aws_direct_metadata.yaml
@@ -0,0 +1,24 @@
+directconnect_GettingStarted_051:
+  title: Get started with Aws Direct Connect using the CLI
+  title_abbrev: Get started with Aws Direct Connect
+  synopsis_list:
+    - Use ec2 CreateVpnGateway
+    - Use ec2 DeleteVpnGateway
+    - Use ec2 DescribeVpnGateways
+    - Use directconnect CreateConnection
+    - Use directconnect CreatePrivateVirtualInterface
+    - Use directconnect DeleteConnection
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/051-aws-direct-connect-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/051-aws-direct-connect-gs/aws-direct-connect-gs.sh
+  services:
+    direct-connect: {CreateConnection, CreatePrivateVirtualInterface, DeleteConnection, DeleteVirtualInterface, DescribeConnections, DescribeLoa, DescribeLocations, DescribeVirtualInterfaces, UpdateConnection}
+    ec2: {CreateVpnGateway, DeleteVpnGateway, DescribeVpnGateways}
diff --git a/.doc_gen/metadata/docdb_documentdb_gs_metadata.yaml b/.doc_gen/metadata/docdb_documentdb_gs_metadata.yaml
new file mode 100644
index 0000000..59537c5
--- /dev/null
+++ b/.doc_gen/metadata/docdb_documentdb_gs_metadata.yaml
@@ -0,0 +1,24 @@
+docdb_GettingStarted_025:
+  title: Getting started with Amazon DocumentDB
+  title_abbrev: Getting started with Amazon DocumentDB
+  synopsis_list:
+    - Create a DB subnet group
+    - Create a DocumentDB cluster
+    - Create a DocumentDB instance
+    - Configure security and connectivity
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/025-documentdb-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/025-documentdb-gs/documentdb-gs.sh
+  services:
+    docdb: {CreateDbCluster, CreateDbInstance, CreateDbSubnetGroup, DeleteDbCluster, DeleteDbInstance, DeleteDbSubnetGroup, DescribeDbClusters, DescribeDbInstances, Wait}
+    ec2: {AuthorizeSecurityGroupIngress, CreateDefaultVpc, DescribeSubnets, DescribeVpcs, RevokeSecurityGroupIngress}
+    secrets-manager: {CreateSecret, DeleteSecret, GetSecretValue}
diff --git a/.doc_gen/metadata/dynamodb_amazon_dynamodb_metadata.yaml b/.doc_gen/metadata/dynamodb_amazon_dynamodb_metadata.yaml
new file mode 100644
index 0000000..9618d6e
--- /dev/null
+++ b/.doc_gen/metadata/dynamodb_amazon_dynamodb_metadata.yaml
@@ -0,0 +1,21 @@
+dynamodb_GettingStarted_070:
+  title: Getting started with DynamoDB
+  title_abbrev: Getting started with DynamoDB
+  synopsis_list:
+    - Create a table in DynamoDB
+    - Update data in a DynamoDB table
+    - Query data in a DynamoDB table
+    - Delete your DynamoDB table
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/070-amazon-dynamodb-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/070-amazon-dynamodb-gs/amazon-dynamodb-gs.sh
+  services:
+    dynamodb: {CreateTable, DeleteTable, DescribeTable, GetItem, PutItem, Query, UpdateContinuousBackups, UpdateItem, Wait}
diff --git a/.doc_gen/metadata/ec2_amazon_elasticache_metadata.yaml b/.doc_gen/metadata/ec2_amazon_elasticache_metadata.yaml
new file mode 100644
index 0000000..6566084
--- /dev/null
+++ b/.doc_gen/metadata/ec2_amazon_elasticache_metadata.yaml
@@ -0,0 +1,21 @@
+ec2_GettingStarted_065:
+  title: Getting started with Amazon ElastiCache
+  title_abbrev: Getting started with Amazon ElastiCache
+  synopsis_list:
+    - Set up security group for ElastiCache access
+    - Create a Valkey serverless cache
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/065-amazon-elasticache-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/065-amazon-elasticache-gs/amazon-elasticache-gs.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, DescribeSecurityGroups, RevokeSecurityGroupIngress}
+    elasticache: {CreateServerlessCache, DeleteServerlessCache, DescribeServerlessCaches}
diff --git a/.doc_gen/metadata/ec2_amazon_managed_metadata.yaml b/.doc_gen/metadata/ec2_amazon_managed_metadata.yaml
new file mode 100644
index 0000000..9b3a7e2
--- /dev/null
+++ b/.doc_gen/metadata/ec2_amazon_managed_metadata.yaml
@@ -0,0 +1,27 @@
+ec2_GettingStarted_057:
+  title: Getting started with Amazon MSK
+  title_abbrev: Getting started with Amazon MSK
+  synopsis_list:
+    - Create an MSK cluster
+    - Create IAM permissions for MSK access
+    - Create a client machine
+    - Get bootstrap brokers
+    - Set up the client machine
+    - Create a topic and produce/consume data
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/057-amazon-managed-streaming-for-apache-kafka-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/057-amazon-managed-streaming-for-apache-kafka-gs/amazon-managed-streaming-for-apache-kafka-gs.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateKeyPair, CreateSecurityGroup, DeleteKeyPair, DeleteSecurityGroup, DescribeAvailabilityZones, DescribeImages, DescribeInstanceTypeOfferings, DescribeInstances, DescribeKeyPairs, DescribeSecurityGroups, DescribeSubnets, DescribeVpcs, RevokeSecurityGroupEgress, RevokeSecurityGroupIngress, RunInstances, TerminateInstances, Wait}
+    iam: {AddRoleToInstanceProfile, AttachRolePolicy, CreateInstanceProfile, CreatePolicy, CreateRole, DeleteInstanceProfile, DeletePolicy, DeleteRole, DetachRolePolicy, GetInstanceProfile, GetPolicy, GetRole, RemoveRoleFromInstanceProfile}
+    kafka: {CreateCluster, DeleteCluster, DescribeCluster, GetBootstrapBrokers}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/ec2_amazon_neptune_metadata.yaml b/.doc_gen/metadata/ec2_amazon_neptune_metadata.yaml
new file mode 100644
index 0000000..807aed7
--- /dev/null
+++ b/.doc_gen/metadata/ec2_amazon_neptune_metadata.yaml
@@ -0,0 +1,25 @@
+ec2_GettingStarted_064:
+  title: Getting started with Amazon Neptune
+  title_abbrev: Getting started with Amazon Neptune
+  synopsis_list:
+    - Create a VPC for your Neptune database
+    - Create subnets in multiple availability zones
+    - Configure security for your Neptune database
+    - Create a Neptune DB subnet group
+    - Create a Neptune DB cluster and instance
+    - Add data to your graph database
+    - Query your graph database
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/064-amazon-neptune-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/064-amazon-neptune-gs/amazon-neptune-gs.sh
+  services:
+    ec2: {AssociateRouteTable, AttachInternetGateway, AuthorizeSecurityGroupIngress, CreateInternetGateway, CreateRoute, CreateRouteTable, CreateSecurityGroup, CreateSubnet, CreateVpc, DeleteInternetGateway, DeleteRouteTable, DeleteSecurityGroup, DeleteSubnet, DeleteVpc, DescribeAvailabilityZones, DetachInternetGateway, ModifyVpcAttribute}
+    neptune: {CreateDbCluster, CreateDbInstance, CreateDbSubnetGroup, DeleteDbCluster, DeleteDbInstance, DeleteDbSubnetGroup, DescribeDbClusters, Wait}
diff --git a/.doc_gen/metadata/ec2_ebs_gs_metadata.yaml b/.doc_gen/metadata/ec2_ebs_gs_metadata.yaml
new file mode 100644
index 0000000..b21cefb
--- /dev/null
+++ b/.doc_gen/metadata/ec2_ebs_gs_metadata.yaml
@@ -0,0 +1,22 @@
+ec2_GettingStarted_020:
+  title: Creating and managing Amazon EBS volumes
+  title_abbrev: Creating and managing Amazon EBS volumes
+  synopsis_list:
+    - Create an EBS volume
+    - Check volume status
+    - Create an EC2 instance (optional)
+    - Attach a volume to an EC2 instance
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/020-ebs-gs-volumes
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/020-ebs-gs-volumes/ebs-gs-volumes.sh
+  services:
+    ec2: {AttachVolume, AuthorizeSecurityGroupIngress, CreateSecurityGroup, CreateVolume, DeleteSecurityGroup, DeleteVolume, DescribeAvailabilityZones, DescribeImages, DescribeInstanceTypeOfferings, DescribeInstances, DescribeSubnets, DescribeVolumes, DescribeVpcs, DetachVolume, RunInstances, TerminateInstances, Wait}
diff --git a/.doc_gen/metadata/ec2_ebs_intermediate_metadata.yaml b/.doc_gen/metadata/ec2_ebs_intermediate_metadata.yaml
new file mode 100644
index 0000000..9ce5a07
--- /dev/null
+++ b/.doc_gen/metadata/ec2_ebs_intermediate_metadata.yaml
@@ -0,0 +1,21 @@
+ec2_GettingStarted_022:
+  title: Working with Amazon EBS encryption, snapshots, and volume initialization
+  title_abbrev: Working with Amazon EBS encryption, snapshots, and volume initialization
+  synopsis_list:
+    - Enable Amazon EBS encryption by default
+    - Create an EBS snapshot
+    - Create and initialize a volume from a snapshot
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/022-ebs-intermediate
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/022-ebs-intermediate/ebs-intermediate.sh
+  services:
+    ec2: {CreateSnapshot, CreateVolume, DeleteSnapshot, DeleteVolume, DescribeAvailabilityZones, DescribeVolumes, DetachVolume, DisableEbsEncryptionByDefault, EnableEbsEncryptionByDefault, GetEbsDefaultKmsKeyId, GetEbsEncryptionByDefault, Wait}
diff --git a/.doc_gen/metadata/ec2_ec2_basics_metadata.yaml b/.doc_gen/metadata/ec2_ec2_basics_metadata.yaml
new file mode 100644
index 0000000..5598deb
--- /dev/null
+++ b/.doc_gen/metadata/ec2_ec2_basics_metadata.yaml
@@ -0,0 +1,23 @@
+ec2_GettingStarted_013:
+  title: Getting started with Amazon EC2
+  title_abbrev: Getting started with Amazon EC2
+  synopsis_list:
+    - Create a key pair
+    - Create a security group
+    - Stop and start your instance
+    - Test Elastic IP persistence
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/013-ec2-basics
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/013-ec2-basics/ec2-basics.sh
+  services:
+    ec2: {AllocateAddress, AssociateAddress, AuthorizeSecurityGroupIngress, CreateKeyPair, CreateSecurityGroup, DeleteKeyPair, DeleteSecurityGroup, DescribeImages, DescribeInstances, DisassociateAddress, ReleaseAddress, RunInstances, StartInstances, StopInstances, TerminateInstances, Wait}
+    ssm: {GetParametersByPath}
diff --git a/.doc_gen/metadata/ec2_marketplace_buyer_metadata.yaml b/.doc_gen/metadata/ec2_marketplace_buyer_metadata.yaml
new file mode 100644
index 0000000..ad5a05d
--- /dev/null
+++ b/.doc_gen/metadata/ec2_marketplace_buyer_metadata.yaml
@@ -0,0 +1,20 @@
+ec2_GettingStarted_030:
+  title: Get started with Marketplace Buyer using the CLI
+  title_abbrev: Get started with Marketplace Buyer
+  synopsis_list:
+    - Use ec2 AuthorizeSecurityGroupIngress
+    - Use ec2 CreateKeyPair
+    - Use ec2 CreateSecurityGroup
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/030-marketplace-buyer-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/030-marketplace-buyer-gs/marketplace-buyer-getting-started.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateKeyPair, CreateSecurityGroup, DeleteKeyPair, DeleteSecurityGroup, DescribeImages, DescribeInstances, RunInstances, TerminateInstances, Wait}
diff --git a/.doc_gen/metadata/ec2_vpc_peering_metadata.yaml b/.doc_gen/metadata/ec2_vpc_peering_metadata.yaml
new file mode 100644
index 0000000..d866cb2
--- /dev/null
+++ b/.doc_gen/metadata/ec2_vpc_peering_metadata.yaml
@@ -0,0 +1,22 @@
+ec2_GettingStarted_015:
+  title: Working with VPC peering connections
+  title_abbrev: Working with VPC peering connections
+  synopsis_list:
+    - Create VPCs for peering
+    - Create a VPC peering connection
+    - Update route tables
+    - Verify the VPC peering connection
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/015-vpc-peering
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/015-vpc-peering/vpc-peering.sh
+  services:
+    ec2: {AcceptVpcPeeringConnection, AssociateRouteTable, CreateRoute, CreateRouteTable, CreateSubnet, CreateVpc, CreateVpcPeeringConnection, DeleteRouteTable, DeleteSubnet, DeleteVpc, DeleteVpcPeeringConnection, DescribeVpcPeeringConnections, DescribeVpcs, DisassociateRouteTable, Wait}
diff --git a/.doc_gen/metadata/ecr_amazon_elastic_metadata.yaml b/.doc_gen/metadata/ecr_amazon_elastic_metadata.yaml
new file mode 100644
index 0000000..c7296c5
--- /dev/null
+++ b/.doc_gen/metadata/ecr_amazon_elastic_metadata.yaml
@@ -0,0 +1,21 @@
+ecr_GettingStarted_078:
+  title: Getting started with Amazon ECR
+  title_abbrev: Getting started with Amazon ECR
+  synopsis_list:
+    - Create a Docker image
+    - Create an Amazon ECR repository
+    - Delete resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/078-amazon-elastic-container-registry-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/078-amazon-elastic-container-registry-gs/amazon-elastic-container-registry-gs.sh
+  services:
+    ecr: {BatchDeleteImage, CreateRepository, DeleteRepository, GetLoginPassword}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/ecs_amazon_ecs_metadata.yaml b/.doc_gen/metadata/ecs_amazon_ecs_metadata.yaml
new file mode 100644
index 0000000..d8ef379
--- /dev/null
+++ b/.doc_gen/metadata/ecs_amazon_ecs_metadata.yaml
@@ -0,0 +1,24 @@
+ecs_GettingStarted_086:
+  title: Create an Amazon ECS Linux task for the Fargate launch type
+  title_abbrev: Create an Amazon ECS Linux task for the Fargate launch type
+  synopsis_list:
+    - Create the cluster
+    - Create a task definition
+    - Create the service
+    - Clean up
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/086-amazon-ecs-fargate-linux
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/086-amazon-ecs-fargate-linux/amazon-ecs-fargate-linux.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateSecurityGroup, DeleteSecurityGroup, DescribeNetworkInterfaces, DescribeSecurityGroups, DescribeSubnets, DescribeVpcs}
+    ecs: {CreateCluster, CreateService, DeleteCluster, DeleteService, DeregisterTaskDefinition, DescribeServices, DescribeTasks, ListTaskDefinitions, ListTasks, RegisterTaskDefinition, UpdateService, Wait}
+    iam: {AttachRolePolicy, CreateRole, GetRole}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/ecs_ecs_ec2_metadata.yaml b/.doc_gen/metadata/ecs_ecs_ec2_metadata.yaml
new file mode 100644
index 0000000..290f66d
--- /dev/null
+++ b/.doc_gen/metadata/ecs_ecs_ec2_metadata.yaml
@@ -0,0 +1,24 @@
+ecs_GettingStarted_018:
+  title: Creating an Amazon ECS service for the EC2 launch type
+  title_abbrev: Creating an Amazon ECS service for the EC2 launch type
+  synopsis_list:
+    - Create an ECS cluster
+    - Create and monitor a service
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/018-ecs-ec2
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/018-ecs-ec2/ecs-ec2-getting-started.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateKeyPair, CreateSecurityGroup, DeleteKeyPair, DeleteSecurityGroup, DescribeInstances, DescribeSubnets, DescribeVpcs, RunInstances, TerminateInstances, Wait}
+    ecs: {CreateCluster, CreateService, DeleteCluster, DeleteService, DeregisterTaskDefinition, DescribeContainerInstances, DescribeServices, DescribeTasks, ListContainerInstances, ListServices, ListTasks, RegisterTaskDefinition, StopTask, UpdateService, Wait}
+    iam: {AddRoleToInstanceProfile, AttachRolePolicy, CreateInstanceProfile, CreateRole, GetRole, Wait}
+    ssm: {GetParameters}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/ecs_service_connect_metadata.yaml b/.doc_gen/metadata/ecs_service_connect_metadata.yaml
new file mode 100644
index 0000000..a691a1d
--- /dev/null
+++ b/.doc_gen/metadata/ecs_service_connect_metadata.yaml
@@ -0,0 +1,29 @@
+ecs_ServiceConnect_085:
+  title: Configure Amazon ECS Service Connect
+  title_abbrev: Configure Amazon ECS Service Connect
+  synopsis_list:
+    - Create the VPC infrastructure
+    - Set up logging
+    - Create the ECS cluster
+    - Configure IAM roles
+    - Create the service with Service Connect
+    - Verify the deployment
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/085-amazon-ecs-service-connect
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/085-amazon-ecs-service-connect/amazon-ecs-service-connect.sh
+  services:
+    cloudwatch-logs: {CreateLogGroup, DeleteLogGroup}
+    ec2: {AuthorizeSecurityGroupIngress, CreateSecurityGroup, DeleteSecurityGroup, DescribeSubnets, DescribeVpcs, Wait}
+    ecs: {CreateCluster, CreateService, DeleteCluster, DeleteService, DeregisterTaskDefinition, DescribeClusters, DescribeServices, DescribeTasks, ListTaskDefinitions, ListTasks, RegisterTaskDefinition, UpdateService, Wait}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy, GetRole}
+    servicediscovery: {DeleteNamespace, DeleteService, ListNamespaces, ListServices}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/eks_eks_gs_metadata.yaml b/.doc_gen/metadata/eks_eks_gs_metadata.yaml
new file mode 100644
index 0000000..849b9f7
--- /dev/null
+++ b/.doc_gen/metadata/eks_eks_gs_metadata.yaml
@@ -0,0 +1,26 @@
+eks_GettingStarted_034:
+  title: Getting started with Amazon EKS
+  title_abbrev: Getting started with Amazon EKS
+  synopsis_list:
+    - Create a VPC for your EKS cluster
+    - Create IAM roles for your EKS cluster
+    - Create your EKS cluster
+    - Configure kubectl to communicate with your cluster
+    - Create a managed node group
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/034-eks-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/034-eks-gs/eks-gs.sh
+  services:
+    cloudformation: {CreateStack, DeleteStack, DescribeStacks, Wait}
+    eks: {CreateCluster, CreateNodegroup, DeleteCluster, DeleteNodegroup, DescribeCluster, DescribeNodegroup, ListNodegroups, UpdateKubeconfig, Wait}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy, GetRole}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/elastic_load_balancing_v2_elastic_load_metadata.yaml b/.doc_gen/metadata/elastic_load_balancing_v2_elastic_load_metadata.yaml
new file mode 100644
index 0000000..2ce2ddb
--- /dev/null
+++ b/.doc_gen/metadata/elastic_load_balancing_v2_elastic_load_metadata.yaml
@@ -0,0 +1,25 @@
+elastic_load_balancing_v2_GettingStarted_058:
+  title: Getting started with Elastic Load Balancing
+  title_abbrev: Getting started with Elastic Load Balancing
+  synopsis_list:
+    - Create an Application Load Balancer
+    - Create a target group
+    - Create a listener
+    - Verify your configuration
+    - Add an HTTPS listener (optional)
+    - Add path-based routing (optional)
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/058-elastic-load-balancing-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/058-elastic-load-balancing-gs/elastic-load-balancing-gs.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateSecurityGroup, DeleteSecurityGroup, DescribeInstances, DescribeSubnets, DescribeVpcs}
+    elastic-load-balancing-v2: {CreateListener, CreateLoadBalancer, CreateTargetGroup, DeleteListener, DeleteLoadBalancer, DeleteTargetGroup, DescribeLoadBalancers, DescribeTargetHealth, Help, RegisterTargets, Wait}
diff --git a/.doc_gen/metadata/emr_emr_gs_metadata.yaml b/.doc_gen/metadata/emr_emr_gs_metadata.yaml
new file mode 100644
index 0000000..3efe627
--- /dev/null
+++ b/.doc_gen/metadata/emr_emr_gs_metadata.yaml
@@ -0,0 +1,22 @@
+emr_GettingStarted_037:
+  title: Getting started with Amazon EMR
+  title_abbrev: Getting started with Amazon EMR
+  synopsis_list:
+    - Create an EC2 key pair
+    - Set up storage and prepare your application
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/037-emr-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/037-emr-gs/emr-gs.sh
+  services:
+    ec2: {CreateKeyPair, DescribeKeyPairs}
+    emr: {AddSteps, CreateCluster, CreateDefaultRoles, DescribeCluster, DescribeStep, Ssh, TerminateClusters, Wait}
+    s3: {Cp, Ls, Mb, Rb, Rm}
diff --git a/.doc_gen/metadata/fargate_metadata.yaml b/.doc_gen/metadata/fargate_metadata.yaml
index 1caf4ef..6373435 100644
--- a/.doc_gen/metadata/fargate_metadata.yaml
+++ b/.doc_gen/metadata/fargate_metadata.yaml
@@ -1,14 +1,12 @@
 fargate_GettingStarted:
-  title: Get started with Batch and Fargate using the CLI
-  title_abbrev: Get started with Batch and Fargate
+  title: Getting started with Batch and Fargate
+  title_abbrev: Getting started with Batch and Fargate
   synopsis_list:
-    - Create an IAM execution role for ECS tasks
-    - Create a managed Fargate compute environment
-    - Create a job queue with priority settings
-    - Register a job definition for containerized workloads
-    - Submit and monitor a batch job execution
-    - View job output in CloudWatch Logs
-    - Clean up resources in proper dependency order
+    - Create an IAM execution role
+    - Create a compute environment
+    - Create a job queue
+    - Create a job definition
+    - Clean up resources
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/glue_glue_gs_metadata.yaml b/.doc_gen/metadata/glue_glue_gs_metadata.yaml
new file mode 100644
index 0000000..e8addda
--- /dev/null
+++ b/.doc_gen/metadata/glue_glue_gs_metadata.yaml
@@ -0,0 +1,20 @@
+glue_GettingStarted_024:
+  title: Getting started with the Glue Data Catalog
+  title_abbrev: Getting started with the Glue Data Catalog
+  synopsis_list:
+    - Create a database
+    - Create a table
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/024-glue-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/024-glue-gs/glue-gs.sh
+  services:
+    glue: {CreateDatabase, CreateTable, DeleteDatabase, DeleteTable, GetDatabase, GetTable}
diff --git a/.doc_gen/metadata/iam_amazon_managed_metadata.yaml b/.doc_gen/metadata/iam_amazon_managed_metadata.yaml
new file mode 100644
index 0000000..9f06b1f
--- /dev/null
+++ b/.doc_gen/metadata/iam_amazon_managed_metadata.yaml
@@ -0,0 +1,24 @@
+iam_GettingStarted_044:
+  title: Creating an Amazon Managed Grafana workspace
+  title_abbrev: Creating an Amazon Managed Grafana workspace
+  synopsis_list:
+    - Create an IAM role for your workspace
+    - Create a Grafana workspace
+    - Configure authentication
+    - Configure optional settings
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/044-amazon-managed-grafana-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/044-amazon-managed-grafana-gs/amazon-managed-grafana-gs.sh
+  services:
+    grafana: {CreateWorkspace, DeleteWorkspace, DescribeWorkspace}
+    iam: {AttachRolePolicy, CreatePolicy, CreateRole, DeletePolicy, DeleteRole, DetachRolePolicy}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/iam_aws_fault_metadata.yaml b/.doc_gen/metadata/iam_aws_fault_metadata.yaml
new file mode 100644
index 0000000..5e2dfc8
--- /dev/null
+++ b/.doc_gen/metadata/iam_aws_fault_metadata.yaml
@@ -0,0 +1,27 @@
+iam_GettingStarted_069:
+  title: Run CPU stress tests on EC2 instances using FIS
+  title_abbrev: Run CPU stress tests on EC2 instances using FIS
+  synopsis_list:
+    - Create IAM roles
+    - Create a CloudWatch alarm
+    - Create an experiment template
+    - Run the experiment
+    - Verify the results
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/069-aws-fault-injection-service-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/069-aws-fault-injection-service-gs/aws-fault-injection-service-getting-started.sh
+  services:
+    cloudwatch: {DeleteAlarms, DescribeAlarms, GetMetricData, PutMetricAlarm}
+    ec2: {DescribeImages, MonitorInstances, RunInstances, TerminateInstances, Wait}
+    fis: {CreateExperimentTemplate, DeleteExperimentTemplate, GetExperiment, StartExperiment, StopExperiment}
+    iam: {AddRoleToInstanceProfile, AttachRolePolicy, CreateInstanceProfile, CreateRole, DeleteInstanceProfile, DeleteRole, DeleteRolePolicy, DetachRolePolicy, GetRole, PutRolePolicy, RemoveRoleFromInstanceProfile}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/iam_aws_step_metadata.yaml b/.doc_gen/metadata/iam_aws_step_metadata.yaml
new file mode 100644
index 0000000..733a9a7
--- /dev/null
+++ b/.doc_gen/metadata/iam_aws_step_metadata.yaml
@@ -0,0 +1,22 @@
+iam_GettingStarted_080:
+  title: Getting started with Step Functions
+  title_abbrev: Getting started with Step Functions
+  synopsis_list:
+    - Create an IAM role for Step Functions
+    - Create your first state machine
+    - Start your state machine execution
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/080-aws-step-functions-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/080-aws-step-functions-gs/aws-step-functions-gs.sh
+  services:
+    iam: {AttachRolePolicy, CreatePolicy, CreateRole, DeletePolicy, DeleteRole, DetachRolePolicy}
+    sfn: {CreateStateMachine, DeleteStateMachine, DescribeExecution, StartExecution, UpdateStateMachine}
diff --git a/.doc_gen/metadata/iam_aws_systems_metadata.yaml b/.doc_gen/metadata/iam_aws_systems_metadata.yaml
new file mode 100644
index 0000000..05cb40d
--- /dev/null
+++ b/.doc_gen/metadata/iam_aws_systems_metadata.yaml
@@ -0,0 +1,24 @@
+iam_GettingStarted_046:
+  title: Setting up Systems Manager
+  title_abbrev: Setting up Systems Manager
+  synopsis_list:
+    - Create IAM permissions for Systems Manager
+    - Create an IAM role for Systems Manager
+    - Configure Systems Manager
+    - Verify the setup
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/046-aws-systems-manager-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/046-aws-systems-manager-gs/aws-systems-manager-gs.sh
+  services:
+    iam: {AttachRolePolicy, CreatePolicy, CreateRole, DeletePolicy, DeleteRole, DetachRolePolicy}
+    ssm: {CreateConfigurationManager, DeleteConfigurationManager, GetConfigurationManager}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/iam_cloudwatch_streams_metadata.yaml b/.doc_gen/metadata/iam_cloudwatch_streams_metadata.yaml
new file mode 100644
index 0000000..422b72e
--- /dev/null
+++ b/.doc_gen/metadata/iam_cloudwatch_streams_metadata.yaml
@@ -0,0 +1,23 @@
+iam_GettingStarted_032:
+  title: Using property variables in CloudWatch dashboards to monitor multiple Lambda functions 
+  title_abbrev: Using property variables in CloudWatch dashboards to monitor multiple Lambda functions 
+  synopsis_list:
+    - Create Lambda functions for monitoring
+    - Create a CloudWatch dashboard
+    - Add a property variable to the dashboard
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/032-cloudwatch-streams
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/032-cloudwatch-streams/cloudwatch-streams.sh
+  services:
+    cloudwatch: {DeleteDashboards, GetDashboard, PutDashboard}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy}
+    lambda: {CreateFunction, DeleteFunction, Invoke}
diff --git a/.doc_gen/metadata/iam_sagemaker_featurestore_metadata.yaml b/.doc_gen/metadata/iam_sagemaker_featurestore_metadata.yaml
new file mode 100644
index 0000000..549f092
--- /dev/null
+++ b/.doc_gen/metadata/iam_sagemaker_featurestore_metadata.yaml
@@ -0,0 +1,24 @@
+iam_GettingStarted_028:
+  title: Getting started with Amazon SageMaker Feature Store
+  title_abbrev: Getting started with Amazon SageMaker Feature Store
+  synopsis_list:
+    - Set up IAM permissions
+    - Create a SageMaker execution role
+    - Create feature groups
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/028-sagemaker-featurestore
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/028-sagemaker-featurestore/sagemaker-featurestore.sh
+  services:
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy, GetRole}
+    s3: {CreateBucket, DeleteBucket, PutPublicAccessBlock, Rm}
+    sagemaker: {CreateFeatureGroup, DeleteFeatureGroup, DescribeFeatureGroup, ListFeatureGroups}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/iot_aws_iot_metadata.yaml b/.doc_gen/metadata/iot_aws_iot_metadata.yaml
new file mode 100644
index 0000000..995c15c
--- /dev/null
+++ b/.doc_gen/metadata/iot_aws_iot_metadata.yaml
@@ -0,0 +1,26 @@
+iot_GettingStarted_079:
+  title: Getting Started with IoT Device Defender 
+  title_abbrev: Getting Started with IoT Device Defender 
+  synopsis_list:
+    - Create Required IAM Roles
+    - Enable IoT Device Defender Audit Checks
+    - Run an On-Demand Audit
+    - Create a Mitigation Action
+    - Apply Mitigation Actions to Findings
+    - Set Up SNS Notifications (Optional)
+    - Enable IoT Logging
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/079-aws-iot-device-defender-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/079-aws-iot-device-defender-gs/aws-iot-device-defender-gs.sh
+  services:
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DeleteRolePolicy, DetachRolePolicy, GetRole, ListRolePolicies, PutRolePolicy}
+    iot: {CreateMitigationAction, DeleteAccountAuditConfiguration, DeleteMitigationAction, DescribeAccountAuditConfiguration, DescribeAuditTask, GetLoggingOptions, GetV2LoggingOptions, ListAuditFindings, ListAuditMitigationActionsTasks, ListMitigationActions, SetLoggingOptions, SetV2LoggingOptions, StartAuditMitigationActionsTask, StartOnDemandAuditTask, UpdateAccountAuditConfiguration}
+    sns: {CreateTopic, DeleteTopic, ListTopics}
diff --git a/.doc_gen/metadata/iot_core_gs_metadata.yaml b/.doc_gen/metadata/iot_core_gs_metadata.yaml
new file mode 100644
index 0000000..67cd80c
--- /dev/null
+++ b/.doc_gen/metadata/iot_core_gs_metadata.yaml
@@ -0,0 +1,22 @@
+iot_GettingStarted_063:
+  title: Getting started with IoT Core
+  title_abbrev: Getting started with IoT Core
+  synopsis_list:
+    - Create IoT resources
+    - Configure your device
+    - Run the sample application
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/063-aws-iot-core-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/063-aws-iot-core-gs/aws-iot-core-gs.sh
+  services:
+    iot: {AttachPolicy, AttachThingPrincipal, CreateKeysAndCertificate, CreatePolicy, CreateThing, DeleteCertificate, DeletePolicy, DeleteThing, DescribeEndpoint, DetachPolicy, DetachThingPrincipal, UpdateCertificate}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/lambda_lambda_gettingstarted_metadata.yaml b/.doc_gen/metadata/lambda_lambda_gettingstarted_metadata.yaml
new file mode 100644
index 0000000..6d5b510
--- /dev/null
+++ b/.doc_gen/metadata/lambda_lambda_gettingstarted_metadata.yaml
@@ -0,0 +1,24 @@
+lambda_GettingStarted_019:
+  title: Creating your first Lambda function
+  title_abbrev: Creating your first Lambda function
+  synopsis_list:
+    - Create an IAM role for Lambda
+    - Create function code
+    - Create a Lambda function
+    - Test your Lambda function
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/019-lambda-gettingstarted
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/019-lambda-gettingstarted/lambda-gettingstarted.sh
+  services:
+    cloudwatch-logs: {DeleteLogGroup, DescribeLogStreams, GetLogEvents}
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy}
+    lambda: {CreateFunction, DeleteFunction, GetFunction, GetFunctionConfiguration, Invoke}
diff --git a/.doc_gen/metadata/lightsail_metadata.yaml b/.doc_gen/metadata/lightsail_metadata.yaml
index 6648b1f..2a152fe 100644
--- a/.doc_gen/metadata/lightsail_metadata.yaml
+++ b/.doc_gen/metadata/lightsail_metadata.yaml
@@ -1,14 +1,11 @@
 lightsail_GettingStarted:
-  title: Get started with Amazon Lightsail using the CLI
-  title_abbrev: Get started with Lightsail
+  title: Getting started with Amazon Lightsail
+  title_abbrev: Getting started with Amazon Lightsail
   synopsis_list:
-    - Explore available blueprints and bundles for instance creation
-    - Create a Lightsail instance with Amazon Linux 2023
-    - Monitor instance status until running
-    - Download default key pair for SSH access
-    - Create and attach additional block storage disk
-    - Create an instance snapshot for backup
-    - Clean up resources to avoid ongoing charges
+    - Create an instance
+    - Add storage to your instance
+    - Create a snapshot
+    - Clean up resources
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/mediaconnect_aws_elemental_metadata.yaml b/.doc_gen/metadata/mediaconnect_aws_elemental_metadata.yaml
new file mode 100644
index 0000000..201f3a1
--- /dev/null
+++ b/.doc_gen/metadata/mediaconnect_aws_elemental_metadata.yaml
@@ -0,0 +1,22 @@
+mediaconnect_GettingStarted_081:
+  title: Getting started with Elemental MediaConnect
+  title_abbrev: Getting started with Elemental MediaConnect
+  synopsis_list:
+    - Verify access to Elemental MediaConnect
+    - Create a flow
+    - Add an output
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/081-aws-elemental-mediaconnect-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/081-aws-elemental-mediaconnect-gs/aws-elemental-mediaconnect-gs.sh
+  services:
+    ec2: {DescribeAvailabilityZones}
+    mediaconnect: {AddFlowOutputs, CreateFlow, DeleteFlow, DescribeFlow, GrantFlowEntitlements, ListFlows, StopFlow}
diff --git a/.doc_gen/metadata/opensearch_opensearch_service_metadata.yaml b/.doc_gen/metadata/opensearch_opensearch_service_metadata.yaml
new file mode 100644
index 0000000..1a4cd69
--- /dev/null
+++ b/.doc_gen/metadata/opensearch_opensearch_service_metadata.yaml
@@ -0,0 +1,21 @@
+opensearch_GettingStarted_016:
+  title: Getting started with Amazon OpenSearch Service
+  title_abbrev: Getting started with Amazon OpenSearch Service
+  synopsis_list:
+    - Create an OpenSearch Service domain
+    - Upload data to your domain
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/016-opensearch-service-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/016-opensearch-service-gs/opensearch-service-gs.sh
+  services:
+    opensearch: {CreateDomain, DeleteDomain, DescribeDomain}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/payment_cryptography_aws_payment_metadata.yaml b/.doc_gen/metadata/payment_cryptography_aws_payment_metadata.yaml
new file mode 100644
index 0000000..0e4c9c7
--- /dev/null
+++ b/.doc_gen/metadata/payment_cryptography_aws_payment_metadata.yaml
@@ -0,0 +1,20 @@
+payment_cryptography_GettingStarted_067:
+  title: Getting started with Payment Cryptography
+  title_abbrev: Getting started with Payment Cryptography
+  synopsis_list:
+    - Create a key
+    - Verify the CVV2 value
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/067-aws-payment-cryptography-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/067-aws-payment-cryptography-gs/aws-payment-cryptography-gs.sh
+  services:
+    payment-cryptography: {CreateKey, DeleteKey, RestoreKey}
diff --git a/.doc_gen/metadata/pinpoint_aws_end_metadata.yaml b/.doc_gen/metadata/pinpoint_aws_end_metadata.yaml
new file mode 100644
index 0000000..d3d0b73
--- /dev/null
+++ b/.doc_gen/metadata/pinpoint_aws_end_metadata.yaml
@@ -0,0 +1,22 @@
+pinpoint_GettingStarted_049:
+  title: Getting started with End User Messaging Push
+  title_abbrev: Getting started with End User Messaging Push
+  synopsis_list:
+    - Create an application
+    - Enable push notification channels
+    - Send a push notification
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/049-aws-end-user-messaging-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/049-aws-end-user-messaging-gs/aws-end-user-messaging-gs.sh
+  services:
+    pinpoint: {CreateApp, DeleteApp, GetApp, GetApps, SendMessages, UpdateApnsChannel, UpdateGcmChannel}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/polly_amazon_polly_metadata.yaml b/.doc_gen/metadata/polly_amazon_polly_metadata.yaml
new file mode 100644
index 0000000..b52e08b
--- /dev/null
+++ b/.doc_gen/metadata/polly_amazon_polly_metadata.yaml
@@ -0,0 +1,18 @@
+polly_GettingStarted_082:
+  title: Getting started with Amazon Polly
+  title_abbrev: Getting started with Amazon Polly
+  synopsis_list:
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/082-amazon-polly-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/082-amazon-polly-gs/amazon-polly-getting-started.sh
+  services:
+    polly: {DeleteLexicon, DescribeVoices, GetLexicon, Help, ListLexicons, PutLexicon, SynthesizeSpeech}
diff --git a/.doc_gen/metadata/rds_rds_gs_metadata.yaml b/.doc_gen/metadata/rds_rds_gs_metadata.yaml
new file mode 100644
index 0000000..ba5b1f7
--- /dev/null
+++ b/.doc_gen/metadata/rds_rds_gs_metadata.yaml
@@ -0,0 +1,23 @@
+rds_GettingStarted_036:
+  title: Creating an Amazon RDS DB instance
+  title_abbrev: Creating an Amazon RDS DB instance
+  synopsis_list:
+    - Set up networking components
+    - Create a DB subnet group
+    - Create a DB instance
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/036-rds-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/036-rds-gs/rds-gs.sh
+  services:
+    ec2: {AuthorizeSecurityGroupIngress, CreateSecurityGroup, DeleteSecurityGroup, DescribeSubnets, DescribeVpcs}
+    rds: {CreateDbInstance, CreateDbSubnetGroup, DeleteDbInstance, DeleteDbSubnetGroup, DescribeDbInstances, Wait}
+    secrets-manager: {CreateSecret, DeleteSecret, GetSecretValue}
diff --git a/.doc_gen/metadata/redshift_redshift_provisioned_metadata.yaml b/.doc_gen/metadata/redshift_redshift_provisioned_metadata.yaml
new file mode 100644
index 0000000..2ac23ed
--- /dev/null
+++ b/.doc_gen/metadata/redshift_redshift_provisioned_metadata.yaml
@@ -0,0 +1,23 @@
+redshift_GettingStarted_039:
+  title: Getting started with Amazon Redshift provisioned clusters
+  title_abbrev: Getting started with Amazon Redshift provisioned clusters
+  synopsis_list:
+    - Create a Redshift cluster
+    - Create an IAM role for S3 access
+    - Create tables and load data
+    - Run example queries
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/039-redshift-provisioned
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/039-redshift-provisioned/redshift-provisioned.sh
+  services:
+    iam: {CreateRole, DeleteRole, DeleteRolePolicy, GetRole, PutRolePolicy}
+    redshift: {CreateCluster, DeleteCluster, DescribeClusters, ModifyClusterIamRoles, Wait}
diff --git a/.doc_gen/metadata/redshift_redshift_serverless_metadata.yaml b/.doc_gen/metadata/redshift_redshift_serverless_metadata.yaml
new file mode 100644
index 0000000..c33cee9
--- /dev/null
+++ b/.doc_gen/metadata/redshift_redshift_serverless_metadata.yaml
@@ -0,0 +1,26 @@
+redshift_GettingStarted_038:
+  title: Get started with Redshift Serverless using the CLI
+  title_abbrev: Get started with Redshift Serverless
+  synopsis_list:
+    - Use secrets-manager CreateSecret
+    - Use secrets-manager DeleteSecret
+    - Use secrets-manager GetSecretValue
+    - Use redshift CreateNamespace
+    - Use redshift CreateWorkgroup
+    - Use redshift DeleteNamespace
+    - Use iam CreateRole
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/038-redshift-serverless
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/038-redshift-serverless/redshift-serverless.sh
+  services:
+    iam: {CreateRole, DeleteRole, DeleteRolePolicy, GetRole, PutRolePolicy}
+    redshift: {CreateNamespace, CreateWorkgroup, DeleteNamespace, DeleteWorkgroup, GetNamespace, GetWorkgroup, UpdateNamespace}
+    secrets-manager: {CreateSecret, DeleteSecret, GetSecretValue}
diff --git a/.doc_gen/metadata/s3_amazon_textract_metadata.yaml b/.doc_gen/metadata/s3_amazon_textract_metadata.yaml
new file mode 100644
index 0000000..7a9d732
--- /dev/null
+++ b/.doc_gen/metadata/s3_amazon_textract_metadata.yaml
@@ -0,0 +1,21 @@
+s3_GettingStarted_074:
+  title: Getting started with Amazon Textract
+  title_abbrev: Getting started with Amazon Textract
+  synopsis_list:
+    - Create an S3 bucket
+    - Upload a document to S3
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/074-amazon-textract-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/074-amazon-textract-gs/amazon-textract-getting-started.sh
+  services:
+    s3: {Cp, Mb, Rb, Rm}
+    textract: {AnalyzeDocument, Help}
diff --git a/.doc_gen/metadata/s3_metadata.yaml b/.doc_gen/metadata/s3_metadata.yaml
index aee37ea..0923ebf 100644
--- a/.doc_gen/metadata/s3_metadata.yaml
+++ b/.doc_gen/metadata/s3_metadata.yaml
@@ -1,16 +1,14 @@
 s3_GettingStarted:
-  title: Get started with Amazon S3 using the CLI
-  title_abbrev: Get started with S3
+  title: Getting started with Amazon S3
+  title_abbrev: Getting started with Amazon S3
   synopsis_list:
-    - Create an S3 bucket with unique naming and regional configuration
-    - Configure bucket security settings including public access blocking
-    - Enable versioning and default encryption for data protection
-    - Upload objects with and without custom metadata
-    - Download objects from the bucket to local storage
-    - Copy objects within the bucket to organize data in folders
-    - List bucket contents and objects with specific prefixes
-    - Add tags to buckets for resource management
-    - Clean up all resources including versioned objects
+    - Create your first S3 bucket
+    - Upload an object
+    - Enable versioning
+    - Configure default encryption
+    - Add tags to your bucket
+    - List objects and versions
+    - Clean up resources
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/secrets_manager_aws_secrets_metadata.yaml b/.doc_gen/metadata/secrets_manager_aws_secrets_metadata.yaml
new file mode 100644
index 0000000..89a91f3
--- /dev/null
+++ b/.doc_gen/metadata/secrets_manager_aws_secrets_metadata.yaml
@@ -0,0 +1,24 @@
+secrets_manager_GettingStarted_073:
+  title: Moving hardcoded secrets to Secrets Manager
+  title_abbrev: Moving hardcoded secrets to Secrets Manager
+  synopsis_list:
+    - Create IAM roles
+    - Create a secret in Secrets Manager
+    - Update your application code
+    - Update the secret
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/073-aws-secrets-manager-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/073-aws-secrets-manager-gs/aws-secrets-manager-gs.sh
+  services:
+    iam: {AttachRolePolicy, CreateRole, DeleteRole, DetachRolePolicy}
+    secrets-manager: {CreateSecret, DeleteSecret, GetSecretValue, PutResourcePolicy, UpdateSecret}
+    sts: {GetCallerIdentity}
diff --git a/.doc_gen/metadata/ses_ses_gs_metadata.yaml b/.doc_gen/metadata/ses_ses_gs_metadata.yaml
new file mode 100644
index 0000000..ac6e14e
--- /dev/null
+++ b/.doc_gen/metadata/ses_ses_gs_metadata.yaml
@@ -0,0 +1,22 @@
+ses_GettingStarted_033:
+  title: Setting up Amazon Simple Email Service (SES)
+  title_abbrev: Setting up Amazon Simple Email Service (SES)
+  synopsis_list:
+    - Verify an email address
+    - Verify a domain (optional)
+    - Check your sending limits
+    - Send a test email
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/033-ses-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/033-ses-gs/ses-gs.sh
+  services:
+    ses: {DeleteIdentity, GetIdentityVerificationAttributes, GetSendQuota, ListIdentities, SendEmail, VerifyDomainDkim, VerifyDomainIdentity, VerifyEmailIdentity}
diff --git a/.doc_gen/metadata/sns_amazon_simple_metadata.yaml b/.doc_gen/metadata/sns_amazon_simple_metadata.yaml
new file mode 100644
index 0000000..955def8
--- /dev/null
+++ b/.doc_gen/metadata/sns_amazon_simple_metadata.yaml
@@ -0,0 +1,22 @@
+sns_GettingStarted_048:
+  title: Create an Amazon SNS topic and publish messages
+  title_abbrev: Create an Amazon SNS topic and publish messages
+  synopsis_list:
+    - Create an Amazon SNS topic
+    - Subscribe an email endpoint to the topic
+    - Verify your subscription
+    - Publish a message to the topic
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/048-amazon-simple-notification-service-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/048-amazon-simple-notification-service-gs/amazon-simple-notification-service-gs.sh
+  services:
+    sns: {CreateTopic, DeleteTopic, ListSubscriptionsByTopic, Publish, Subscribe, Unsubscribe}
diff --git a/.doc_gen/metadata/support_aws_support_metadata.yaml b/.doc_gen/metadata/support_aws_support_metadata.yaml
new file mode 100644
index 0000000..0e45fea
--- /dev/null
+++ b/.doc_gen/metadata/support_aws_support_metadata.yaml
@@ -0,0 +1,20 @@
+support_GettingStarted_062:
+  title: Getting started with Support
+  title_abbrev: Getting started with Support
+  synopsis_list:
+    - Check available services and severity levels
+    - Create a support case
+    - Add communications to a case
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/062-aws-support-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/062-aws-support-gs/aws-support-gs.sh
+  services:
+    support: {AddCommunicationToCase, CreateCase, DescribeCases, DescribeCommunications, DescribeServices, DescribeSeverityLevels, ResolveCase}
diff --git a/.doc_gen/metadata/vpc_gs_metadata.yaml b/.doc_gen/metadata/vpc_gs_metadata.yaml
index 4db43d4..fc338b7 100644
--- a/.doc_gen/metadata/vpc_gs_metadata.yaml
+++ b/.doc_gen/metadata/vpc_gs_metadata.yaml
@@ -1,16 +1,14 @@
 vpc_GettingStartedCLI:
-  title: Get started using Amazon VPC using the CLI
-  title_abbrev: Get started with Amazon VPC 
+  title: Getting started with Amazon VPC
+  title_abbrev: Create a basic VPC
   synopsis_list:
-    - Set up your account
-    - Create and configure a VPC
-    - Configure your network
-    - Configure security
-    - Deploy resources
-    - Test and verify
-    - Clean up resources
-    - Consider production implications
-    - Consider security implications
+    - Create a VPC
+    - Create subnets
+    - Configure internet connectivity
+    - Create a NAT Gateway
+    - Configure subnet settings
+    - Create security groups
+    - Verify your VPC configuration
   category: Scenarios
   languages:
     Bash:
@@ -28,7 +26,7 @@ vpc_GettingStartedCLI:
 
 vpc_GettingStartedIpam:
   title: Get started using Amazon VPC IPAM using the CLI
-  title_abbrev: Get started with VPC IPAM
+  title_abbrev: VPC with IPAM
   synopsis_list:
   - Set up and configure Amazon VPC IP Address Manager (IPAM) using the CLI.
   - Create an IPAM with operating regions (e.g., us-east-1, us-west-2).
@@ -57,7 +55,7 @@ vpc_GettingStartedIpam:
 
 vpc_GettingStartedPrivate:
   title: Create a VPC with private subnets and NAT gateways using the CLI
-  title_abbrev: Create a VPC with private subnets and NAT gateways
+  title_abbrev: VPC with private servers
   synopsis_list:
   - Create a VPC with private subnets and NAT gateways using the CLI.
   - Set up the necessary components including VPC, subnets, route tables, and NAT gateways.
diff --git a/.doc_gen/metadata/vpc_lattice_amazon_vpc_metadata.yaml b/.doc_gen/metadata/vpc_lattice_amazon_vpc_metadata.yaml
new file mode 100644
index 0000000..e672c76
--- /dev/null
+++ b/.doc_gen/metadata/vpc_lattice_amazon_vpc_metadata.yaml
@@ -0,0 +1,25 @@
+vpc_lattice_GettingStarted_055:
+  title: Creating and managing a VPC Lattice service network
+  title_abbrev: Creating and managing a VPC Lattice service network
+  synopsis_list:
+    - Create a service network
+    - Create a service
+    - List available VPCs
+    - List security groups for the selected VPC
+    - List service associations
+    - List VPC associations
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/055-amazon-vpc-lattice-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/055-amazon-vpc-lattice-gs/amazon-vpc-lattice-getting-started.sh
+  services:
+    ec2: {DescribeSecurityGroups, DescribeVpcs}
+    vpc-lattice: {CreateService, CreateServiceNetwork, CreateServiceNetworkServiceAssociation, CreateServiceNetworkVpcAssociation, DeleteService, DeleteServiceNetwork, DeleteServiceNetworkServiceAssociation, DeleteServiceNetworkVpcAssociation, GetService, GetServiceNetwork, GetServiceNetworkServiceAssociation, GetServiceNetworkVpcAssociation, ListServiceNetworkServiceAssociations, ListServiceNetworkVpcAssociations}
diff --git a/.doc_gen/metadata/vpc_transit_gateway_metadata.yaml b/.doc_gen/metadata/vpc_transit_gateway_metadata.yaml
index 3db6411..52875b0 100644
--- a/.doc_gen/metadata/vpc_transit_gateway_metadata.yaml
+++ b/.doc_gen/metadata/vpc_transit_gateway_metadata.yaml
@@ -1,14 +1,12 @@
 vpc_TransitGatewayGettingStarted:
-  title: Get started with Transit Gateway using the CLI
-  title_abbrev: Get started with Transit Gateway
+  title: Getting started with Amazon VPC Transit Gateway
+  title_abbrev: Getting started with Amazon VPC Transit Gateway
   synopsis_list:
-    - Create a transit gateway with DNS support and default route table settings
-    - Wait for the transit gateway to become available
-    - Attach two VPCs to the transit gateway using subnets
-    - Wait for VPC attachments to become available
-    - Add routes between VPCs through the transit gateway
-    - Test connectivity between VPC resources
-    - Clean up resources including routes, attachments, and transit gateway
+    - Create a transit gateway
+    - Attach your VPCs to your transit gateway
+    - Add routes between the transit gateway and your VPCs
+    - Test the transit gateway
+    - Clean up resources
   category: Scenarios
   languages:
     Bash:
diff --git a/.doc_gen/metadata/wafv2_aws_waf_metadata.yaml b/.doc_gen/metadata/wafv2_aws_waf_metadata.yaml
new file mode 100644
index 0000000..f02f79c
--- /dev/null
+++ b/.doc_gen/metadata/wafv2_aws_waf_metadata.yaml
@@ -0,0 +1,24 @@
+wafv2_GettingStarted_052:
+  title: Getting started with WAF
+  title_abbrev: Getting started with WAF
+  synopsis_list:
+    - Create a web ACL
+    - Add a string match rule
+    - Add managed rules
+    - Configure logging
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/052-aws-waf-gs
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/052-aws-waf-gs/aws-waf-gs.sh
+  services:
+    cloudfront: {ListDistributions}
+    sts: {GetCallerIdentity}
+    wafv2: {AssociateWebAcl, CreateWebAcl, DeleteWebAcl, DisassociateWebAcl, GetWebAcl, UpdateWebAcl}
diff --git a/.doc_gen/metadata/workspaces_workspaces_personal_metadata.yaml b/.doc_gen/metadata/workspaces_workspaces_personal_metadata.yaml
new file mode 100644
index 0000000..9c98fe4
--- /dev/null
+++ b/.doc_gen/metadata/workspaces_workspaces_personal_metadata.yaml
@@ -0,0 +1,22 @@
+workspaces_GettingStarted_035:
+  title: Creating and managing Amazon WorkSpaces Personal
+  title_abbrev: Creating and managing Amazon WorkSpaces Personal
+  synopsis_list:
+    - Verify WorkSpaces availability in your region
+    - List available WorkSpaces bundles
+    - Create a WorkSpace
+    - Check the status of your WorkSpace
+    - Clean up resources
+  category: Scenarios
+  languages:
+    Bash:
+      versions:
+        - sdk_version: 2
+          github_name: "Sample developer tutorials"
+          github: https://github.com/aws-samples/sample-developer-tutorials/tree/main/tuts/035-workspaces-personal
+          excerpts:
+            - description:
+              snippet_files:
+                - tuts/035-workspaces-personal/workspaces-personal.sh
+  services:
+    workspaces: {CreateWorkspaces, DeregisterWorkspaceDirectory, DescribeWorkspaceBundles, DescribeWorkspaceDirectories, DescribeWorkspaces, RegisterWorkspaceDirectory, TerminateWorkspaces}
diff --git a/.doc_gen/validation.yaml b/.doc_gen/validation.yaml
new file mode 100644
index 0000000..128a0ca
--- /dev/null
+++ b/.doc_gen/validation.yaml
@@ -0,0 +1,5 @@
+allow_list:
+  - "bPxRfiCYEXAMPLEKEY/wJalrXUtnFEMI/K7MDENG"
+  - "role/AmazonEC2ContainerServiceforEC2Role"
+sample_files:
+  - "README.md"
diff --git a/tuts/038-redshift-serverless/redshift-serverless.sh b/tuts/038-redshift-serverless/redshift-serverless.sh
index c102c42..93651d3 100755
--- a/tuts/038-redshift-serverless/redshift-serverless.sh
+++ b/tuts/038-redshift-serverless/redshift-serverless.sh
@@ -556,8 +556,8 @@ else
   fi
 fi
 
-# Query 2: Find events in the 99.9 percentile in terms of all time gross sales
-echo "Running query: Find events in the 99.9 percentile in terms of all time gross sales..."
+# Query 2: Find events in the 99.9 percentile in terms of all time total sales
+echo "Running query: Find events in the 99.9 percentile in terms of all time total sales..."
 QUERY2_OUTPUT=$(aws redshift-data execute-statement \
   --database "$DB_NAME" \
   --workgroup-name "$WORKGROUP_NAME" \