diff --git a/APIGateway-SQS-ReceiveMessages/template.yaml b/APIGateway-SQS-ReceiveMessages/template.yaml
index 801fd5b19..5d18c5f63 100644
--- a/APIGateway-SQS-ReceiveMessages/template.yaml
+++ b/APIGateway-SQS-ReceiveMessages/template.yaml
@@ -115,7 +115,7 @@ Outputs:
   # API Gateway Invoke URL
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+    Value: !Sub https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod
 
   QueueName:
     Description: SQS Name
diff --git a/activemq-lambda-sam-java/template.yaml b/activemq-lambda-sam-java/template.yaml
index c363a9eb7..ae7d6b685 100644
--- a/activemq-lambda-sam-java/template.yaml
+++ b/activemq-lambda-sam-java/template.yaml
@@ -147,7 +147,7 @@ Resources:
 Outputs:
   ActiveMQWebConsole:
     Description: The ActiveMQ web-console host
-    Value: !Sub 'https://${MyMQBroker}-1.mq.${AWS::Region}.amazonaws.com:8162/admin/index.jsp'
+    Value: !Sub 'https://${MyMQBroker}-1.mq.${AWS::Region}.${AWS::URLSuffix}:8162/admin/index.jsp'
   MyMQMessageHandlerFunction:
     Description: The name of the ActiveMQ message handler function
     Value: !Ref MyMQMessageHandlerFunction
diff --git a/amplify_cognito_apigateway_lambda_envvariables/template.yaml b/amplify_cognito_apigateway_lambda_envvariables/template.yaml
index 67a870c3a..2fcca0d2e 100644
--- a/amplify_cognito_apigateway_lambda_envvariables/template.yaml
+++ b/amplify_cognito_apigateway_lambda_envvariables/template.yaml
@@ -185,7 +185,7 @@ Resources:
         - Name: user_pools_web_client_id
           Value: !Ref rAmplifyCognitoClient
         - Name: APIURL
-          Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.amazonaws.com/dev"
+          Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
       Repository: !Ref AmplifyFrontendRepository
       OauthToken: !Ref OauthToken
      
@@ -222,6 +222,6 @@ Outputs:
 
   APIurl:
     Description: API url
-    Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.amazonaws.com/dev"
+    Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
     Export:
       Name: APIurl
\ No newline at end of file
diff --git a/apigw-api-key/template.yaml b/apigw-api-key/template.yaml
index 58491ced7..2679c8112 100644
--- a/apigw-api-key/template.yaml
+++ b/apigw-api-key/template.yaml
@@ -83,4 +83,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-appsync-dynamodb-sam/template.yaml b/apigw-appsync-dynamodb-sam/template.yaml
index f5c0f0e35..0da235569 100644
--- a/apigw-appsync-dynamodb-sam/template.yaml
+++ b/apigw-appsync-dynamodb-sam/template.yaml
@@ -209,7 +209,7 @@ Resources:
 Outputs:
   ApiGatewayEndpoint:
     Description: "HTTP API Gateway endpoint for /restaurant path"
-    Value: !Sub "https://${HttpApiProxy}.execute-api.${AWS::Region}.amazonaws.com/restaurant"
+    Value: !Sub "https://${HttpApiProxy}.execute-api.${AWS::Region}.${AWS::URLSuffix}/restaurant"
 
   AppSyncApiKey:
     Description: "AppSync API Key"
diff --git a/apigw-cache-invalidation-eventbridge/template.yaml b/apigw-cache-invalidation-eventbridge/template.yaml
index 221dbef4f..3d489438e 100644
--- a/apigw-cache-invalidation-eventbridge/template.yaml
+++ b/apigw-cache-invalidation-eventbridge/template.yaml
@@ -298,7 +298,7 @@ Resources:
 Outputs:
   ApiUrl:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
 
   CloudWatchDashboard:
     Condition: deployMetricsDashboard
diff --git a/apigw-caching-sam/template.yaml b/apigw-caching-sam/template.yaml
index 31f14d265..635354bb1 100644
--- a/apigw-caching-sam/template.yaml
+++ b/apigw-caching-sam/template.yaml
@@ -42,4 +42,4 @@ Resources:
 Outputs:
   CachedApiUrl:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${CachedApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${CachedApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
diff --git a/apigw-client-certificate/template.yaml b/apigw-client-certificate/template.yaml
index f3f202244..6f4362a18 100644
--- a/apigw-client-certificate/template.yaml
+++ b/apigw-client-certificate/template.yaml
@@ -69,4 +69,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-cloudwatch/template.yaml b/apigw-cloudwatch/template.yaml
index b07c610f9..4b08ae6fc 100644
--- a/apigw-cloudwatch/template.yaml
+++ b/apigw-cloudwatch/template.yaml
@@ -55,7 +55,7 @@ Outputs:
   # API endpoint for testing
   ApiEndpoint:
     Description: API endpoint URL
-    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod
   LogGroupName:
     Description: Name of the log group
     Value: !Ref MyLogGroup
\ No newline at end of file
diff --git a/apigw-comprehend/template.yaml b/apigw-comprehend/template.yaml
index cf0e8e56f..fb698125c 100644
--- a/apigw-comprehend/template.yaml
+++ b/apigw-comprehend/template.yaml
@@ -71,4 +71,4 @@ Outputs:
   ComprehendApiEndpoint:
     Description: API endpoint URL
     Value: !Sub >-
-      https://${ComprehendApi}.execute-api.${AWS::Region}.amazonaws.com/prod/detectSentiment
\ No newline at end of file
+      https://${ComprehendApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/detectSentiment
\ No newline at end of file
diff --git a/apigw-custom-resource-policy/template.yaml b/apigw-custom-resource-policy/template.yaml
index 4272d0fb3..88230fb75 100644
--- a/apigw-custom-resource-policy/template.yaml
+++ b/apigw-custom-resource-policy/template.yaml
@@ -45,4 +45,4 @@ Resources:
 Outputs:
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${TempApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
\ No newline at end of file
+    Value: !Sub "https://${TempApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
\ No newline at end of file
diff --git a/apigw-data-validation/template.yaml b/apigw-data-validation/template.yaml
index 6fd9fb5b5..0e0d46662 100644
--- a/apigw-data-validation/template.yaml
+++ b/apigw-data-validation/template.yaml
@@ -57,4 +57,4 @@ Resources:
 Outputs:
   ProcessApi:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${MainApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
\ No newline at end of file
+    Value: !Sub "https://${MainApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
\ No newline at end of file
diff --git a/apigw-ddb-openapi-crud/template.yaml b/apigw-ddb-openapi-crud/template.yaml
index cf3de2c49..371bc4dbb 100644
--- a/apigw-ddb-openapi-crud/template.yaml
+++ b/apigw-ddb-openapi-crud/template.yaml
@@ -73,4 +73,4 @@ Resources:
 Outputs:
   CrudApiUrl:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${CrudAPI}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
\ No newline at end of file
+    Value: !Sub "https://${CrudAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
\ No newline at end of file
diff --git a/apigw-direct-s3-lambda-dotnet/template.yaml b/apigw-direct-s3-lambda-dotnet/template.yaml
index 99a08927d..10517e7dd 100644
--- a/apigw-direct-s3-lambda-dotnet/template.yaml
+++ b/apigw-direct-s3-lambda-dotnet/template.yaml
@@ -181,7 +181,7 @@ Resources:
             - image/jpeg
 Outputs:
   API:
-    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/prod/
+    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/
     Description: API Gateway URL    
   S3LambdaAuthorizerFunction:
     Description: "Lambda authorizer Function used to protect API"
diff --git a/apigw-dynamodb-kinesis-lambda/template.yaml b/apigw-dynamodb-kinesis-lambda/template.yaml
index 916a44893..3979af10f 100644
--- a/apigw-dynamodb-kinesis-lambda/template.yaml
+++ b/apigw-dynamodb-kinesis-lambda/template.yaml
@@ -134,7 +134,7 @@ Outputs:
   ApiRootUrl:
     Description: Root Url of the API
     Value: !Sub 
-      - 'https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/${StageName}'
+      - 'https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${StageName}'
       - ApiId: !Ref Api
   LambdaFunction:
     Description: Lambda Function ARN
diff --git a/apigw-dynamodb-lambda-scheduler-ses-auto-deletion-sam/template.yaml b/apigw-dynamodb-lambda-scheduler-ses-auto-deletion-sam/template.yaml
index 1d2489b20..f7812d9ab 100644
--- a/apigw-dynamodb-lambda-scheduler-ses-auto-deletion-sam/template.yaml
+++ b/apigw-dynamodb-lambda-scheduler-ses-auto-deletion-sam/template.yaml
@@ -137,4 +137,4 @@ Resources:
 
 Outputs:
   apiGatewayInvokeURL:
-    Value: !Sub https://${APIGateway}.execute-api.${AWS::Region}.amazonaws.com/v1
\ No newline at end of file
+    Value: !Sub https://${APIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/v1
\ No newline at end of file
diff --git a/apigw-ec2/template.yaml b/apigw-ec2/template.yaml
index 68294b597..568e8fa2d 100644
--- a/apigw-ec2/template.yaml
+++ b/apigw-ec2/template.yaml
@@ -227,6 +227,6 @@ Resources:
 Outputs:
   WebsiteURL:
     Value: !Sub 
-            - "curl https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/v0"
+            - "curl https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/v0"
             - ApiId: !Ref ApiGatewayRestApi
     Description: ApiGateway URL
\ No newline at end of file
diff --git a/apigw-execution-access-logs/template.yaml b/apigw-execution-access-logs/template.yaml
index 6fe42c2ae..142a83485 100644
--- a/apigw-execution-access-logs/template.yaml
+++ b/apigw-execution-access-logs/template.yaml
@@ -81,7 +81,7 @@ Outputs:
   # API endpoint for testing
   MyApi:
     Description: API endpoint URL
-    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/prod/
+    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/
   MyLogGroup:
     Description: Name of the log group
     Value: !Ref MyLogGroup                        
diff --git a/apigw-http-api-eventbridge-java/template.yaml b/apigw-http-api-eventbridge-java/template.yaml
index 78514acd4..07a097a9b 100644
--- a/apigw-http-api-eventbridge-java/template.yaml
+++ b/apigw-http-api-eventbridge-java/template.yaml
@@ -61,4 +61,4 @@ Resources:
 Outputs:
   ApiEndpoint:
     Description: "HTTP API endpoint URL"
-    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.amazonaws.com"
\ No newline at end of file
+    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
\ No newline at end of file
diff --git a/apigw-http-api-eventbridge/template.yaml b/apigw-http-api-eventbridge/template.yaml
index 56046bd59..2b7100ba7 100644
--- a/apigw-http-api-eventbridge/template.yaml
+++ b/apigw-http-api-eventbridge/template.yaml
@@ -54,4 +54,4 @@ Resources:
 Outputs:
   ApiEndpoint:
     Description: "HTTP API endpoint URL"
-    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.amazonaws.com"
\ No newline at end of file
+    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
\ No newline at end of file
diff --git a/apigw-http-api-lambda-dotnet-sam/template.yaml b/apigw-http-api-lambda-dotnet-sam/template.yaml
index 6aa1edd8f..ba1369bb4 100644
--- a/apigw-http-api-lambda-dotnet-sam/template.yaml
+++ b/apigw-http-api-lambda-dotnet-sam/template.yaml
@@ -1,32 +1,32 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
+---
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
 Description: An AWS Serverless Application that uses the ASP.NET Core framework running in AWS Lambda. (uksb-1tthgi812) (tag:apigw-http-api-lambda-dotnet-sam)
-
-Resources:
-  AspNetCoreFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: HttpApi::HttpApi.LambdaEntryPoint::FunctionHandlerAsync
-      Runtime: dotnet6
-      CodeUri: HttpApi/
-      MemorySize: 256
-      Timeout: 30
-      Policies:
-      - AWSLambda_FullAccess
-      Events:
-        ProxyResource:
-          Type: Api
-          Properties:
-            Path: "/{proxy+}"
-            Method: ANY
-        RootResource:
-          Type: Api
-          Properties:
-            Path: "/"
-            Method: ANY
-Outputs:
-  ApiURL:
-    Description: API endpoint URL for Prod environment
-    Value:
-      Fn::Sub: https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/
+
+Resources:
+  AspNetCoreFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: HttpApi::HttpApi.LambdaEntryPoint::FunctionHandlerAsync
+      Runtime: dotnet6
+      CodeUri: HttpApi/
+      MemorySize: 256
+      Timeout: 30
+      Policies:
+      - AWSLambda_FullAccess
+      Events:
+        ProxyResource:
+          Type: Api
+          Properties:
+            Path: "/{proxy+}"
+            Method: ANY
+        RootResource:
+          Type: Api
+          Properties:
+            Path: "/"
+            Method: ANY
+Outputs:
+  ApiURL:
+    Description: API endpoint URL for Prod environment
+    Value:
+      Fn::Sub: https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/
diff --git a/apigw-http-api-lambda-rds-proxy-java/template.yaml b/apigw-http-api-lambda-rds-proxy-java/template.yaml
index a78283875..685fdc703 100644
--- a/apigw-http-api-lambda-rds-proxy-java/template.yaml
+++ b/apigw-http-api-lambda-rds-proxy-java/template.yaml
@@ -73,8 +73,8 @@ Resources:
 Outputs:
   ApiBasePath:
     Description: "API Gateway endpoint URL"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
   RdsProxyApiPath:
     Description: "API Gateway endpoint URL for rds proxy function"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com/"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/"
diff --git a/apigw-http-api-lambda-rds-proxy/template.yaml b/apigw-http-api-lambda-rds-proxy/template.yaml
index b869d1fb0..d46657135 100644
--- a/apigw-http-api-lambda-rds-proxy/template.yaml
+++ b/apigw-http-api-lambda-rds-proxy/template.yaml
@@ -74,8 +74,8 @@ Resources:
 Outputs:
   ApiBasePath:
     Description: "API Gateway endpoint URL"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
   RdsProxyApiPath:
     Description: "API Gateway endpoint URL for rds proxy function"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com/"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/"
diff --git a/apigw-iam/template.yaml b/apigw-iam/template.yaml
index b2a940aee..9ec0fde87 100644
--- a/apigw-iam/template.yaml
+++ b/apigw-iam/template.yaml
@@ -62,7 +62,7 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
 
   # IAM username to test an authorized call
   AuthorizedUserUsername:
diff --git a/apigw-kinesis-lambda-ddb/template.yaml b/apigw-kinesis-lambda-ddb/template.yaml
index 6e110eb62..b236c21fc 100644
--- a/apigw-kinesis-lambda-ddb/template.yaml
+++ b/apigw-kinesis-lambda-ddb/template.yaml
@@ -246,4 +246,4 @@ Resources:
 Outputs:
   RestApiEndpoint:
     Description: "Rest API endpoint"
-    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
diff --git a/apigw-kinesis-lambda/template.yaml b/apigw-kinesis-lambda/template.yaml
index 1cee348ba..10a3fcf64 100644
--- a/apigw-kinesis-lambda/template.yaml
+++ b/apigw-kinesis-lambda/template.yaml
@@ -157,7 +157,7 @@ Outputs:
   ApiRootUrl:
     Description: Root Url of the API
     Value: !Sub 
-      - 'https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/dev'
+      - 'https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev'
       - ApiId: !Ref Api
   
   KinesisStream:
diff --git a/apigw-kinesis/template.yaml b/apigw-kinesis/template.yaml
index 4b9824be4..2d1afce7f 100644
--- a/apigw-kinesis/template.yaml
+++ b/apigw-kinesis/template.yaml
@@ -209,7 +209,7 @@ Outputs:
   ApiRootUrl:
     Description: Root Url of the API
     Value: !Sub 
-      - 'https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/dev'
+      - 'https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev'
       - ApiId: !Ref Api
   
   KinesisStream:
diff --git a/apigw-lambda-authorizer-custom-header/template.yaml b/apigw-lambda-authorizer-custom-header/template.yaml
index 389d21d5a..f293b32ba 100644
--- a/apigw-lambda-authorizer-custom-header/template.yaml
+++ b/apigw-lambda-authorizer-custom-header/template.yaml
@@ -61,4 +61,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-lambda-authorizer/template.yaml b/apigw-lambda-authorizer/template.yaml
index 5f05f3ac1..694ba1af8 100644
--- a/apigw-lambda-authorizer/template.yaml
+++ b/apigw-lambda-authorizer/template.yaml
@@ -89,4 +89,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
diff --git a/apigw-lambda-bedrock-js-sam/template.yaml b/apigw-lambda-bedrock-js-sam/template.yaml
index 026869942..18d66e7fd 100644
--- a/apigw-lambda-bedrock-js-sam/template.yaml
+++ b/apigw-lambda-bedrock-js-sam/template.yaml
@@ -60,4 +60,4 @@ Outputs:
     Value: !Ref BedrockLambdaFunction
   BedrockRestApi:
     Description: "API Gateway endpoint URL for the v1 stage of the Bedrock Rest API"
-    Value: !Sub "https://${BedrockRestApi}.execute-api.${AWS::Region}.amazonaws.com/v1/bedrock_test"
+    Value: !Sub "https://${BedrockRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/v1/bedrock_test"
diff --git a/apigw-lambda-bedrock-sam-java/template.yaml b/apigw-lambda-bedrock-sam-java/template.yaml
index 75cc7fc1e..7c4d63df4 100644
--- a/apigw-lambda-bedrock-sam-java/template.yaml
+++ b/apigw-lambda-bedrock-sam-java/template.yaml
@@ -46,4 +46,4 @@ Outputs:
   APIGatewayEndpoint:
     Description: API Gateway Endpoint
     Value:
-      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/invoke
+      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/invoke
diff --git a/apigw-lambda-bedrock-sam/template.yaml b/apigw-lambda-bedrock-sam/template.yaml
index 31f9f7a5b..163fe5d31 100644
--- a/apigw-lambda-bedrock-sam/template.yaml
+++ b/apigw-lambda-bedrock-sam/template.yaml
@@ -62,4 +62,4 @@ Outputs:
     Value: !Ref ContentGenerationLambdaFunction
   GenerateContentAPI:
     Description: "API Gateway endpoint URL for the dev stage of the Generate Content API"
-    Value: !Sub "https://${GenerateContentApi}.execute-api.${AWS::Region}.amazonaws.com/dev/generate_content/"
+    Value: !Sub "https://${GenerateContentApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/generate_content/"
diff --git a/apigw-lambda-cognito-sam-java/template.yaml b/apigw-lambda-cognito-sam-java/template.yaml
index 0484d1d8f..fde382203 100644
--- a/apigw-lambda-cognito-sam-java/template.yaml
+++ b/apigw-lambda-cognito-sam-java/template.yaml
@@ -120,17 +120,17 @@ Outputs:
   CreateUserAPIGatewayEndpoint:
     Description: Create User API Gateway Endpoint
     Value:
-      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/users
+      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/users
   
   ConfirmUserAPIGatewayEndpoint:
     Description: Confirm User API Gateway Endpoint
     Value:
-      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/confirm
+      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/confirm
   
   LoginUserAPIGatewayEndpoint:
     Description: Login User API Gateway Endpoint
     Value:
-      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/login
+      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/login
 
   MyCognitoUserPoolId:
     Description: The ID of the Cognito User Pool
diff --git a/apigw-lambda-comprehend-sam/template.yaml b/apigw-lambda-comprehend-sam/template.yaml
index 02680abe2..097cf5847 100644
--- a/apigw-lambda-comprehend-sam/template.yaml
+++ b/apigw-lambda-comprehend-sam/template.yaml
@@ -40,4 +40,4 @@ Resources:
 Outputs:
   SentimentAnalysisAPI:
     Description: "API Gateway endpoint URL for the dev stage of the Detect Sentiment API"
-    Value: !Sub "https://${DetectSentimentApi}.execute-api.${AWS::Region}.amazonaws.com/dev/detect_sentiment/"
+    Value: !Sub "https://${DetectSentimentApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/detect_sentiment/"
diff --git a/apigw-lambda-dynamodb-kinesis-lambda/template.yaml b/apigw-lambda-dynamodb-kinesis-lambda/template.yaml
index 90e7935e0..64dcba6b6 100644
--- a/apigw-lambda-dynamodb-kinesis-lambda/template.yaml
+++ b/apigw-lambda-dynamodb-kinesis-lambda/template.yaml
@@ -67,4 +67,4 @@ Resources:
 Outputs:
   EndpointUrl:
     Description: 'HTTP REST endpoint URL'
-    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod'
+    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod'
diff --git a/apigw-lambda-dynamodb-sam-java/template.yaml b/apigw-lambda-dynamodb-sam-java/template.yaml
index d4e564494..362f05d81 100644
--- a/apigw-lambda-dynamodb-sam-java/template.yaml
+++ b/apigw-lambda-dynamodb-sam-java/template.yaml
@@ -51,4 +51,4 @@ Outputs:
   PaymentsEndpoint:
     Description: API Gateway Payments Endpoint
     Value:
-      Fn::Sub: https://${ticketAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/ticket
+      Fn::Sub: https://${ticketAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/ticket
diff --git a/apigw-lambda-dynamodb-stream-lambda/template.yaml b/apigw-lambda-dynamodb-stream-lambda/template.yaml
index a972cd994..772cbea75 100644
--- a/apigw-lambda-dynamodb-stream-lambda/template.yaml
+++ b/apigw-lambda-dynamodb-stream-lambda/template.yaml
@@ -62,4 +62,4 @@ Resources:
 Outputs:
   EndpointUrl:
     Description: 'HTTP REST endpoint URL'
-    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod'
+    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod'
diff --git a/apigw-lambda-dynamodb/template.yaml b/apigw-lambda-dynamodb/template.yaml
index d388f213b..c097ab0ea 100644
--- a/apigw-lambda-dynamodb/template.yaml
+++ b/apigw-lambda-dynamodb/template.yaml
@@ -26,4 +26,4 @@ Resources:
 Outputs:
   EndpointUrl:
     Description: 'HTTP REST endpoint URL'
-    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod'
+    Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod'
diff --git a/apigw-lambda-healthscribe-sam/template.yaml b/apigw-lambda-healthscribe-sam/template.yaml
index a557e7375..7ffa486cf 100644
--- a/apigw-lambda-healthscribe-sam/template.yaml
+++ b/apigw-lambda-healthscribe-sam/template.yaml
@@ -101,7 +101,7 @@ Outputs:
     Value: !Ref ClinicalNotesGenerationLambdaFunction
   GenerateClinicalNotesAPI:
     Description: API Gateway endpoint URL for the dev stage of the Generate Content API
-    Value: !Sub https://${GenerateClinicalNotesAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/generate_clinical_notes/
+    Value: !Sub https://${GenerateClinicalNotesAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/generate_clinical_notes/
   TranscribeNotesBucket:
     Description: S3 Bucket for storing transcribe notes
     Value: !Ref TranscribeNotesBucket
\ No newline at end of file
diff --git a/apigw-lambda-json-xml-vtl-transformation/template.yaml b/apigw-lambda-json-xml-vtl-transformation/template.yaml
index 0a72de0bf..6cd53bdec 100644
--- a/apigw-lambda-json-xml-vtl-transformation/template.yaml
+++ b/apigw-lambda-json-xml-vtl-transformation/template.yaml
@@ -145,7 +145,7 @@ Resources:
 Outputs:
   MyApiEndpoint:
     Description: "API endpoint"
-    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
   MyLambdaFunction:
     Description: MyLambdaFunction name
diff --git a/apigw-lambda-memorydb/template.yaml b/apigw-lambda-memorydb/template.yaml
index 4cc2e9d61..b75b5fb28 100644
--- a/apigw-lambda-memorydb/template.yaml
+++ b/apigw-lambda-memorydb/template.yaml
@@ -140,7 +140,7 @@ Outputs:
     Value: !Ref memdbClusterVPC
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${HelloWorldAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/hello/"
+    Value: !Sub "https://${HelloWorldAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/hello/"
   HelloWorldFunction:
     Description: "Hello World Lambda Function ARN"
     Value: !GetAtt HelloWorldFunction.Arn
diff --git a/apigw-lambda-observability/template.yaml b/apigw-lambda-observability/template.yaml
index 8c940478c..01108e927 100644
--- a/apigw-lambda-observability/template.yaml
+++ b/apigw-lambda-observability/template.yaml
@@ -241,7 +241,7 @@ Resources:
 Outputs:
   APIEndpoint:
     Description: "API Gateway endpoint URL"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com/"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/"
 
   DashboardURL:
     Description: "Dashboard URL"
diff --git a/apigw-lambda-qldb/template.yaml b/apigw-lambda-qldb/template.yaml
index d8c6a209b..d8a1ad819 100644
--- a/apigw-lambda-qldb/template.yaml
+++ b/apigw-lambda-qldb/template.yaml
@@ -179,7 +179,7 @@ Outputs:
 
   PersonApi:
     Description: "API Gateway endpoint URL for Prod stage for Person functions"
-    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/person/"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/person/"
 
   PersonLedger:
     Description: QLDB Ledger for the sample application
diff --git a/apigw-lambda-request-validator/template.yaml b/apigw-lambda-request-validator/template.yaml
index 3b2e21ed7..5406586a1 100644
--- a/apigw-lambda-request-validator/template.yaml
+++ b/apigw-lambda-request-validator/template.yaml
@@ -124,4 +124,4 @@ Resources:
 Outputs:
   RestApiEndpoint:
     Description: The endpoint for the REST API Gateway.
-    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/prod/"
+    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/"
diff --git a/apigw-lambda-s3-sam-java/template.yaml b/apigw-lambda-s3-sam-java/template.yaml
index 94c335fc0..00ed8738d 100644
--- a/apigw-lambda-s3-sam-java/template.yaml
+++ b/apigw-lambda-s3-sam-java/template.yaml
@@ -66,7 +66,7 @@ Outputs:
   APIGatewayEndpoint:
     Description: API Gateway Endpoint
     Value:
-      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/invoke
+      Fn::Sub: https://${MyAPIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/invoke
   MyS3BucketName:
     Description: S3 Bucket Name
     Value: !Ref MyS3Bucket
diff --git a/apigw-lambda-ses/template.yaml b/apigw-lambda-ses/template.yaml
index b913e058c..464935a47 100644
--- a/apigw-lambda-ses/template.yaml
+++ b/apigw-lambda-ses/template.yaml
@@ -62,4 +62,4 @@ Outputs:
     Value: !GetAtt EmailSESLambda.Arn
   
   apiGatewayInvokeURL:
-    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/sendEmail
+    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/sendEmail
diff --git a/apigw-lambda-sfn-transcribe-translate-polly-sam/template.yaml b/apigw-lambda-sfn-transcribe-translate-polly-sam/template.yaml
index 715a4033e..067985e1b 100644
--- a/apigw-lambda-sfn-transcribe-translate-polly-sam/template.yaml
+++ b/apigw-lambda-sfn-transcribe-translate-polly-sam/template.yaml
@@ -126,7 +126,7 @@ Resources:
                 !Ref CapstoneWebSocketApi,
                 ".execute-api.",
                 !Ref "AWS::Region",
-                ".amazonaws.com/dev",
+                ".${AWS::URLSuffix}/dev",
               ],
             ]
           statemachine_arn: !Ref Orchestrator
@@ -398,7 +398,7 @@ Resources:
         Statement:
           - Effect: Allow
             Principal:
-              Service: !Sub "states.${AWS::Region}.amazonaws.com"
+              Service: !Sub "states.${AWS::Region}.${AWS::URLSuffix}"
             Action: "sts:AssumeRole"
       Policies:
         - PolicyName: stepfn
diff --git a/apigw-lambda-snapstart/template.yaml b/apigw-lambda-snapstart/template.yaml
index 4d7dd38f5..8856b60f6 100644
--- a/apigw-lambda-snapstart/template.yaml
+++ b/apigw-lambda-snapstart/template.yaml
@@ -55,4 +55,4 @@ Outputs:
   UnicornEndpoint:
     Description: API Gateway Unicorn Endpoint
     Value:
-      Fn::Sub: https://${UnicornStoreSpringApi}.execute-api.${AWS::Region}.amazonaws.com/prod/
\ No newline at end of file
+      Fn::Sub: https://${UnicornStoreSpringApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/
\ No newline at end of file
diff --git a/apigw-lambda-sns-monitoring-sam/template.yaml b/apigw-lambda-sns-monitoring-sam/template.yaml
index 22e18061b..91d2779c7 100644
--- a/apigw-lambda-sns-monitoring-sam/template.yaml
+++ b/apigw-lambda-sns-monitoring-sam/template.yaml
@@ -40,7 +40,7 @@ Resources:
       Environment:
         Variables:
           TOPIC_ARN: !Ref MySnsTopic
-          API_URL: !Sub 'https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/${RestApi.Stage}'
+          API_URL: !Sub 'https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${RestApi.Stage}'
       Policies:
         - SNSPublishMessagePolicy:
             TopicName: !GetAtt MySnsTopic.TopicName
@@ -145,7 +145,7 @@ Resources:
           from aws_synthetics.common import synthetics_logger as logger
 
           def main():
-              url = "https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/${RestApi.Stage}"
+              url = "https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${RestApi.Stage}"
               
               # Set screenshot option
               takeScreenshot = True
@@ -175,7 +175,7 @@ Outputs:
     Value: !Ref MySnsTopic
 
   apiGatewayInvokeURL:
-    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/${RestApi.Stage}
+    Value: !Sub https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${RestApi.Stage}
 
   CloudWatchAlarmName:
     Description: Name of the API Gateway 5XX Error Alarm
diff --git a/apigw-lambda-translate-polly-s3/template.yaml b/apigw-lambda-translate-polly-s3/template.yaml
index c5dda2532..277c4d81c 100644
--- a/apigw-lambda-translate-polly-s3/template.yaml
+++ b/apigw-lambda-translate-polly-s3/template.yaml
@@ -55,4 +55,4 @@ Resources:
 Outputs:
   RestApiEndpoint:
     Description: "The endpoint for the REST API Gateway"
-    Value: !Sub "https://${ApiGatewayApi}.execute-api.${AWS::Region}.amazonaws.com/prod/"
+    Value: !Sub "https://${ApiGatewayApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/"
diff --git a/apigw-lambda-translate/template.yaml b/apigw-lambda-translate/template.yaml
index 622a6d304..e6ae9e5c1 100644
--- a/apigw-lambda-translate/template.yaml
+++ b/apigw-lambda-translate/template.yaml
@@ -33,4 +33,4 @@ Resources:
 Outputs:
   RestApiEndpoint:
     Description: "The endpoint for the REST API Gateway"
-    Value: !Sub "https://${ApiGatewayApi}.execute-api.${AWS::Region}.amazonaws.com/prod/"
+    Value: !Sub "https://${ApiGatewayApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/"
diff --git a/apigw-mappingtemplate-lambda/template.yaml b/apigw-mappingtemplate-lambda/template.yaml
index 9558a05eb..9c247e85f 100644
--- a/apigw-mappingtemplate-lambda/template.yaml
+++ b/apigw-mappingtemplate-lambda/template.yaml
@@ -35,4 +35,4 @@ Resources:
 Outputs:
   API:
     Description: Invoke URL to test mapping template
-    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/dev"
+    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
diff --git a/apigw-method-cache/template.yaml b/apigw-method-cache/template.yaml
index 297f8bc84..6abb0c435 100644
--- a/apigw-method-cache/template.yaml
+++ b/apigw-method-cache/template.yaml
@@ -70,4 +70,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-resource-policy/template.yaml b/apigw-resource-policy/template.yaml
index 4172b9dd1..aedfa2f32 100644
--- a/apigw-resource-policy/template.yaml
+++ b/apigw-resource-policy/template.yaml
@@ -44,4 +44,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-rest-api-batch-sam/template.yaml b/apigw-rest-api-batch-sam/template.yaml
index 670ad93ef..309805619 100644
--- a/apigw-rest-api-batch-sam/template.yaml
+++ b/apigw-rest-api-batch-sam/template.yaml
@@ -233,4 +233,4 @@ Outputs:
     Value: !Select [0, !Split [":", !Select [1, !Split ['/', !Ref JobDefinition]]]] 
   ApiEndpoint: 
     Description: "API Gateway endpoint URL for Prod stage for Product api"
-    Value: !Sub "https://${apiGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/"
\ No newline at end of file
+    Value: !Sub "https://${apiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/"
\ No newline at end of file
diff --git a/apigw-rest-api-eventbridge-sam/template.yaml b/apigw-rest-api-eventbridge-sam/template.yaml
index f09858ade..90656139f 100644
--- a/apigw-rest-api-eventbridge-sam/template.yaml
+++ b/apigw-rest-api-eventbridge-sam/template.yaml
@@ -123,7 +123,7 @@ Resources:
 Outputs:
   ApiEndpoint: 
     Description: "API Gateway endpoint URL for Prod stage for Product api"
-    Value: !Sub "https://${apiGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/"
+    Value: !Sub "https://${apiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/"
 
 
 
diff --git a/apigw-rest-api-http-integration/template.yaml b/apigw-rest-api-http-integration/template.yaml
index 98a1049db..516f858ff 100644
--- a/apigw-rest-api-http-integration/template.yaml
+++ b/apigw-rest-api-http-integration/template.yaml
@@ -47,4 +47,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-rest-api-lambda-dotnet/template.yaml b/apigw-rest-api-lambda-dotnet/template.yaml
index 0cbc2b650..97ad4872d 100644
--- a/apigw-rest-api-lambda-dotnet/template.yaml
+++ b/apigw-rest-api-lambda-dotnet/template.yaml
@@ -37,7 +37,7 @@ Outputs:
   # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/hello/"
   HelloWorldFunction:
     Description: "Hello World Lambda Function ARN"
     Value: !GetAtt HelloWorldFunction.Arn
diff --git a/apigw-rest-api-lambda-java/template.yaml b/apigw-rest-api-lambda-java/template.yaml
index 40075b521..495b384d0 100644
--- a/apigw-rest-api-lambda-java/template.yaml
+++ b/apigw-rest-api-lambda-java/template.yaml
@@ -36,7 +36,7 @@ Outputs:
   # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/hello/"
   HelloWorldFunction:
     Description: "Hello World Lambda Function ARN"
     Value: !GetAtt HelloWorldFunction.Arn
diff --git a/apigw-rest-api-lambda-node/template.yaml b/apigw-rest-api-lambda-node/template.yaml
index 19cc30654..169633969 100644
--- a/apigw-rest-api-lambda-node/template.yaml
+++ b/apigw-rest-api-lambda-node/template.yaml
@@ -32,7 +32,7 @@ Outputs:
   # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
   HelloWorldApi:
     Description: API Gateway endpoint URL for Prod stage for Hello World function
-    Value: !Sub https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/
+    Value: !Sub https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/hello/
   HelloWorldFunction:
     Description: Hello World Lambda Function ARN
     Value: !GetAtt HelloWorldFunction.Arn
diff --git a/apigw-rest-api-lambda-python/template.yaml b/apigw-rest-api-lambda-python/template.yaml
index afdbf4896..23b33fd22 100644
--- a/apigw-rest-api-lambda-python/template.yaml
+++ b/apigw-rest-api-lambda-python/template.yaml
@@ -32,7 +32,7 @@ Outputs:
   # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/hello/"
   HelloWorldFunction:
     Description: "Hello World Lambda Function ARN"
     Value: !GetAtt HelloWorldFunction.Arn
diff --git a/apigw-rest-api-mock-integration/template.yaml b/apigw-rest-api-mock-integration/template.yaml
index 12109ee93..e3b714108 100644
--- a/apigw-rest-api-mock-integration/template.yaml
+++ b/apigw-rest-api-mock-integration/template.yaml
@@ -50,4 +50,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-rest-api-private-alb-integration/template.yaml b/apigw-rest-api-private-alb-integration/template.yaml
index 5866b354e..2606d49d2 100644
--- a/apigw-rest-api-private-alb-integration/template.yaml
+++ b/apigw-rest-api-private-alb-integration/template.yaml
@@ -232,4 +232,4 @@ Resources:
 Outputs:
   PrivateIntApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${PrivateIntApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${PrivateIntApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
diff --git a/apigw-rest-api-vpclink/template.yaml b/apigw-rest-api-vpclink/template.yaml
index 2fb6359a6..0907ab311 100644
--- a/apigw-rest-api-vpclink/template.yaml
+++ b/apigw-rest-api-vpclink/template.yaml
@@ -57,4 +57,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-rest-apigw-rest/template.yaml b/apigw-rest-apigw-rest/template.yaml
index ba85a1df6..1517b1ea2 100644
--- a/apigw-rest-apigw-rest/template.yaml
+++ b/apigw-rest-apigw-rest/template.yaml
@@ -108,10 +108,10 @@ Resources:
 Outputs:
   ReportingEndpoint:
     Description: Reporting API endpoint
-    Value: !Sub "https://${ReportingApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${ReportingApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
   UserManagementEndpoint:
     Description: User management API endpoint
-    Value: !Sub "https://${UserManagementApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${UserManagementApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
   PrimaryApiEndpoint:
     Description: Primary API endpoint
-    Value: !Sub "https://${PrimaryApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${PrimaryApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-rest-edge-lambda/template.yaml b/apigw-rest-edge-lambda/template.yaml
index 1cef20c09..38cafc988 100644
--- a/apigw-rest-edge-lambda/template.yaml
+++ b/apigw-rest-edge-lambda/template.yaml
@@ -37,6 +37,6 @@ Resources:
 Outputs:
   EndpointUrl:
     Description: 'REST Edge-optimized endpoint URL'
-    Value: !Sub 'https://${ApiEdgeOptimized}.execute-api.${AWS::Region}.amazonaws.com/prod'
+    Value: !Sub 'https://${ApiEdgeOptimized}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod'
 
 
diff --git a/apigw-rest-regional-lambda/template.yaml b/apigw-rest-regional-lambda/template.yaml
index 874a7146a..2b5166dbe 100644
--- a/apigw-rest-regional-lambda/template.yaml
+++ b/apigw-rest-regional-lambda/template.yaml
@@ -37,6 +37,6 @@ Resources:
 Outputs:
   EndpointUrl:
     Description: 'REST regional endpoint URL'
-    Value: !Sub 'https://${ApiRegional}.execute-api.${AWS::Region}.amazonaws.com/prod'
+    Value: !Sub 'https://${ApiRegional}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod'
 
 
diff --git a/apigw-rest-sagemaker/template.yaml b/apigw-rest-sagemaker/template.yaml
index e10bbac25..36f842ef7 100644
--- a/apigw-rest-sagemaker/template.yaml
+++ b/apigw-rest-sagemaker/template.yaml
@@ -207,7 +207,7 @@ Outputs:
   ApiRootUrl:
     Description: Root Url of the API
     Value: !Sub 
-      - 'https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/${ApigatewayStageName}'
+      - 'https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${ApigatewayStageName}'
       - ApiId: !Ref Api
   ApiKeyId:
     Description: API Key Id
diff --git a/apigw-route53-failover/template.yaml b/apigw-route53-failover/template.yaml
index 21b6f6d84..8bde597d8 100644
--- a/apigw-route53-failover/template.yaml
+++ b/apigw-route53-failover/template.yaml
@@ -93,4 +93,4 @@ Resources:
 Outputs:
   HelloWorldApi:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${RestApiGateway}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${RestApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
diff --git a/apigw-s3-proxy/template.yaml b/apigw-s3-proxy/template.yaml
index 8a09722ce..7a3b004f7 100644
--- a/apigw-s3-proxy/template.yaml
+++ b/apigw-s3-proxy/template.yaml
@@ -146,4 +146,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/{folder}/{item+}"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/{folder}/{item+}"
\ No newline at end of file
diff --git a/apigw-ses-transformation/template.yaml b/apigw-ses-transformation/template.yaml
index 181de5210..af9da4766 100644
--- a/apigw-ses-transformation/template.yaml
+++ b/apigw-ses-transformation/template.yaml
@@ -186,4 +186,4 @@ Resources:
 Outputs:
   ApiEndpoint: 
     Description: "API Gateway endpoint URL for Email API"
-    Value: !Sub "https://${ApiGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/"
\ No newline at end of file
+    Value: !Sub "https://${ApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/"
\ No newline at end of file
diff --git a/apigw-sfn-crud/template.yaml b/apigw-sfn-crud/template.yaml
index 1a5508c01..c3cd7580b 100644
--- a/apigw-sfn-crud/template.yaml
+++ b/apigw-sfn-crud/template.yaml
@@ -107,4 +107,4 @@ Resources:
 Outputs:
   ApiEndpoint:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/apigw-sfn/template.yaml b/apigw-sfn/template.yaml
index 43280bd1c..912b4a2f4 100644
--- a/apigw-sfn/template.yaml
+++ b/apigw-sfn/template.yaml
@@ -79,6 +79,6 @@ Resources:
 Outputs:
   HelloWorldApi:
     Description: "Sync WF API endpoint"
-    Value: !Sub "https://${HttpApiforSyncWF}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${HttpApiforSyncWF}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
 
diff --git a/apigw-sns-sms/template.yaml b/apigw-sns-sms/template.yaml
index b2627ef23..46c50c5d8 100644
--- a/apigw-sns-sms/template.yaml
+++ b/apigw-sns-sms/template.yaml
@@ -45,4 +45,4 @@ Resources:
 Outputs:
   API:
     Description: API to send SMS using SNS
-    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/dev"
+    Value: !Sub "https://${RestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
diff --git a/apigw-sqs-lambda-ddb/template.yaml b/apigw-sqs-lambda-ddb/template.yaml
index 015837ce1..4950dbeca 100644
--- a/apigw-sqs-lambda-ddb/template.yaml
+++ b/apigw-sqs-lambda-ddb/template.yaml
@@ -298,4 +298,4 @@ Resources:
 Outputs:
   HttpApiEndpoint:
     Description: "Http API endpoint"
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
diff --git a/apigw-sqs-lambda-iot/template.yaml b/apigw-sqs-lambda-iot/template.yaml
index d76cc14ee..49ea57a02 100644
--- a/apigw-sqs-lambda-iot/template.yaml
+++ b/apigw-sqs-lambda-iot/template.yaml
@@ -203,4 +203,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
diff --git a/apigw-sqs-lambda-java/template.yaml b/apigw-sqs-lambda-java/template.yaml
index f2aeab296..f056c9098 100644
--- a/apigw-sqs-lambda-java/template.yaml
+++ b/apigw-sqs-lambda-java/template.yaml
@@ -103,7 +103,7 @@ Resources:
 Outputs:
   MyHttpApiEndpoint:
     Description: "HTTP API endpoint"
-    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
   SQSLambdaFunction:
     Description: SQSLambdaFunction function name
diff --git a/apigw-sqs-lambda/template.yaml b/apigw-sqs-lambda/template.yaml
index 1144a25f2..b1527c4fc 100644
--- a/apigw-sqs-lambda/template.yaml
+++ b/apigw-sqs-lambda/template.yaml
@@ -101,7 +101,7 @@ Resources:
 Outputs:
   MyHttpApiEndpoint:
     Description: "HTTP API endpoint"
-    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${MyHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
 
   MyLambdaFunction:
     Description: MyLambdaFunction function name
diff --git a/apigw-sqs-rest/template.yaml b/apigw-sqs-rest/template.yaml
index 9a8c12108..a80f1f6bb 100644
--- a/apigw-sqs-rest/template.yaml
+++ b/apigw-sqs-rest/template.yaml
@@ -113,7 +113,7 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
 
   QueueName:
     Description: SQS Name
diff --git a/apigw-throttle-sam/template.yaml b/apigw-throttle-sam/template.yaml
index a0e5e5003..d9a578827 100644
--- a/apigw-throttle-sam/template.yaml
+++ b/apigw-throttle-sam/template.yaml
@@ -79,4 +79,4 @@ Resources:
 Outputs:
   ThrottlingApiUrl:
     Description: API Gateway endpoint URL for Prod stage for Hello World function
-    Value: !Sub "https://${ThrottlingApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${ThrottlingApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
diff --git a/apigw-translate/template.yaml b/apigw-translate/template.yaml
index 6118d0530..1cb22c142 100644
--- a/apigw-translate/template.yaml
+++ b/apigw-translate/template.yaml
@@ -71,6 +71,6 @@ Resources:
 Outputs:
   ApiEndpoint:
     Description: API Gateway Endpoint URL
-    Value: !Sub "https://${TranslateApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/translate"
+    Value: !Sub "https://${TranslateApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/translate"
 
 
diff --git a/apigw-usage-plans/template.yaml b/apigw-usage-plans/template.yaml
index a8e6cec4f..8f4d7cdb1 100644
--- a/apigw-usage-plans/template.yaml
+++ b/apigw-usage-plans/template.yaml
@@ -75,4 +75,4 @@ Resources:
 Outputs:
   UsagePlanApi:
     Description: API Gateway endpoint URL for Prod stage for usage API
-    Value: !Sub "https://${UsagePlanAPI}.execute-api.${AWS::Region}.amazonaws.com/${UsagePlanAPIProdStage}/plantest"
\ No newline at end of file
+    Value: !Sub "https://${UsagePlanAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${UsagePlanAPIProdStage}/plantest"
\ No newline at end of file
diff --git a/apigw-websocket-api-bedrock-streaming/template.yaml b/apigw-websocket-api-bedrock-streaming/template.yaml
index ddb27226d..38d69eb28 100644
--- a/apigw-websocket-api-bedrock-streaming/template.yaml
+++ b/apigw-websocket-api-bedrock-streaming/template.yaml
@@ -279,7 +279,7 @@ Outputs:
     Value: !GetAtt InvokeModelLambdaFunction.Arn
   WebSocketURL:
     Description: "The WSS Protocol URL to connect to"
-    Value: !Join [ '', [ 'wss://', !Ref WebSocketApi, '.execute-api.',!Ref 'AWS::Region','.amazonaws.com/',!Ref 'Stage'] ]
+    Value: !Join [ '', [ 'wss://', !Ref WebSocketApi, '.execute-api.',!Ref 'AWS::Region','.${AWS::URLSuffix}/',!Ref 'Stage'] ]
   WebSocketConnectionsTableNameArn:
     Description: "WebSocket connections table ARN"
     Value: !GetAtt WebSocketConnectionsTableName.Arn
\ No newline at end of file
diff --git a/apigw-websocket-api-connection-dynamodb/template.yaml b/apigw-websocket-api-connection-dynamodb/template.yaml
index fc3ded857..81d00c316 100644
--- a/apigw-websocket-api-connection-dynamodb/template.yaml
+++ b/apigw-websocket-api-connection-dynamodb/template.yaml
@@ -250,7 +250,7 @@ Resources:
 Outputs:
   APIEndpoint:
     Description: "API Gateway WebSocket endpoint URL"
-    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.amazonaws.com/${ApiStageName}"
+    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${ApiStageName}"
 
   SessionsTable:
     Description: "DynamoDB sessions table for WebSocket API connection ID tracking"
diff --git a/apigw-websocket-api-lambda-authorizer/template.yaml b/apigw-websocket-api-lambda-authorizer/template.yaml
index ebf70ade1..e5fdb8746 100644
--- a/apigw-websocket-api-lambda-authorizer/template.yaml
+++ b/apigw-websocket-api-lambda-authorizer/template.yaml
@@ -263,7 +263,7 @@ Outputs:
         - !Ref 'SimpleChatWebSocketApi'
         - .execute-api.
         - !Ref 'AWS::Region'
-        - .amazonaws.com/
+        - .${AWS::URLSuffix}/
         - !Ref 'Stage'
     Description: The WSS Protocol URI to connect to
   UserpoolId:
diff --git a/apigw-websocket-api-sfn-async/template.yaml b/apigw-websocket-api-sfn-async/template.yaml
index 1292a2254..3b06f5fed 100644
--- a/apigw-websocket-api-sfn-async/template.yaml
+++ b/apigw-websocket-api-sfn-async/template.yaml
@@ -104,7 +104,7 @@ Resources:
             Type: Task
             Resource: arn:aws:states:::apigateway:invoke
             Parameters:
-              ApiEndpoint: !Sub "${WebSocketApi}.execute-api.${AWS::Region}.amazonaws.com"
+              ApiEndpoint: !Sub "${WebSocketApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
               Method: POST
               Stage: !Sub "${ApiStageName}"
               Path.$: "States.Format('/@connections/{}', $.ConnectionID)"
@@ -167,5 +167,5 @@ Resources:
 Outputs:
   APIEndpoint:
     Description: "API Gateway WebSocket endpoint URL"
-    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.amazonaws.com/${ApiStageName}"
+    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${ApiStageName}"
 
diff --git a/apigw-websocket-api-sfn-sync/template.yaml b/apigw-websocket-api-sfn-sync/template.yaml
index 2f584da33..2e34e6fe2 100644
--- a/apigw-websocket-api-sfn-sync/template.yaml
+++ b/apigw-websocket-api-sfn-sync/template.yaml
@@ -145,5 +145,5 @@ Resources:
 Outputs:
   APIEndpoint:
     Description: "API Gateway WebSocket endpoint URL"
-    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.amazonaws.com/${ApiStageName}"
+    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${ApiStageName}"
 
diff --git a/apigw-websocket-api-sns/template.yaml b/apigw-websocket-api-sns/template.yaml
index 844422752..4f5a08049 100644
--- a/apigw-websocket-api-sns/template.yaml
+++ b/apigw-websocket-api-sns/template.yaml
@@ -235,5 +235,5 @@ Resources:
 Outputs:
   APIEndpoint:
     Description: "API Gateway endpoint URL"
-    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.amazonaws.com/${ApiStageName}"
+    Value: !Sub "wss://${WebSocketApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/${ApiStageName}"
 
diff --git a/apigw-websocket-lambda-bedrock-sam/template.yaml b/apigw-websocket-lambda-bedrock-sam/template.yaml
index b2538e296..cea4cd2af 100644
--- a/apigw-websocket-lambda-bedrock-sam/template.yaml
+++ b/apigw-websocket-lambda-bedrock-sam/template.yaml
@@ -134,6 +134,6 @@ Resources:
 Outputs:
   WebSocketURL:
     Description: "WebSocket URL"
-    Value: !Sub "wss://${WebSocketAPI}.execute-api.${AWS::Region}.amazonaws.com/prod"
+    Value: !Sub "wss://${WebSocketAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod"
 
     
diff --git a/apigw-websocket-mapping-template-authorizer/template.yaml b/apigw-websocket-mapping-template-authorizer/template.yaml
index 2afa7b0f5..7cb4a4652 100644
--- a/apigw-websocket-mapping-template-authorizer/template.yaml
+++ b/apigw-websocket-mapping-template-authorizer/template.yaml
@@ -240,7 +240,7 @@ Resources:
 Outputs:
   WebSocketCommand:
     Description: "The WSS command to use to connect"
-    Value: !Join [ '', [ 'wscat --header token:hello -c wss://', !Ref WebsocketApi, '.execute-api.',!Ref 'AWS::Region','.amazonaws.com/',!Ref 'Stage'] ]
+    Value: !Join [ '', [ 'wscat --header token:hello -c wss://', !Ref WebsocketApi, '.execute-api.',!Ref 'AWS::Region','.${AWS::URLSuffix}/',!Ref 'Stage'] ]
   PayloadJson:
     Description: "The Json payload you can send to try the sendmessage route"
     Value: '{"action": "sendmessage","message" : "hey queen"}'
diff --git a/appconfig-feature-flag-sam/template.yaml b/appconfig-feature-flag-sam/template.yaml
index 7753f51c0..f639f96b0 100644
--- a/appconfig-feature-flag-sam/template.yaml
+++ b/appconfig-feature-flag-sam/template.yaml
@@ -183,7 +183,7 @@ Outputs:
   HttpApiUrl:
     Description: URL of your API endpoint
     Value:
-      Fn::Sub: 'https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com/'
+      Fn::Sub: 'https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/'
   HttpApiId:
     Description: Api id of HttpApi
     Value:
diff --git a/appsync-apigateway-dynamodb-sam/template.yaml b/appsync-apigateway-dynamodb-sam/template.yaml
index 8ef49ba76..0a82395ec 100644
--- a/appsync-apigateway-dynamodb-sam/template.yaml
+++ b/appsync-apigateway-dynamodb-sam/template.yaml
@@ -191,7 +191,7 @@ Resources:
       Type: "HTTP"
       ServiceRoleArn: !GetAtt AppsyncApigatewayDatasourceRole.Arn
       HttpConfig: 
-        Endpoint: !Sub "https://${APIGateway}.execute-api.${AWS::Region}.amazonaws.com"
+        Endpoint: !Sub "https://${APIGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
         AuthorizationConfig: 
           AuthorizationType: AWS_IAM
           AwsIamConfig: 
diff --git a/appsync-bedrock/template.yaml b/appsync-bedrock/template.yaml
index 9cffdb045..a25965429 100644
--- a/appsync-bedrock/template.yaml
+++ b/appsync-bedrock/template.yaml
@@ -81,7 +81,7 @@ Resources:
       Type: HTTP
       ServiceRoleArn: !GetAtt BedrockDataSourceRole.Arn
       HttpConfig:
-        Endpoint: !Sub "https://bedrock-runtime.${AWS::Region}.amazonaws.com/"
+        Endpoint: !Sub "https://bedrock-runtime.${AWS::Region}.${AWS::URLSuffix}/"
         AuthorizationConfig:
           AuthorizationType: AWS_IAM
           AwsIamConfig:
diff --git a/appsync-stepfunctions-express-sam/template.yaml b/appsync-stepfunctions-express-sam/template.yaml
index 6fcf336fb..8a43495be 100644
--- a/appsync-stepfunctions-express-sam/template.yaml
+++ b/appsync-stepfunctions-express-sam/template.yaml
@@ -82,7 +82,7 @@ Resources:
       Type: HTTP
       ServiceRoleArn: !GetAtt StepFunctionDataSourceRole.Arn
       HttpConfig:
-        Endpoint: !Sub "https://sync-states.${AWS::Region}.amazonaws.com/"
+        Endpoint: !Sub "https://sync-states.${AWS::Region}.${AWS::URLSuffix}/"
         AuthorizationConfig:
           AuthorizationType: AWS_IAM
           AwsIamConfig:
diff --git a/appsync-stepfunctions-express-sync-bedrock-sam/template.yaml b/appsync-stepfunctions-express-sync-bedrock-sam/template.yaml
index 329bc7a5a..16ab3e782 100644
--- a/appsync-stepfunctions-express-sync-bedrock-sam/template.yaml
+++ b/appsync-stepfunctions-express-sync-bedrock-sam/template.yaml
@@ -82,7 +82,7 @@ Resources:
       Type: HTTP
       ServiceRoleArn: !GetAtt StepFunctionDataSourceRole.Arn
       HttpConfig:
-        Endpoint: !Sub "https://sync-states.${AWS::Region}.amazonaws.com/"
+        Endpoint: !Sub "https://sync-states.${AWS::Region}.${AWS::URLSuffix}/"
         AuthorizationConfig:
           AuthorizationType: AWS_IAM
           AwsIamConfig:
diff --git a/cloudfront-apigw-rest-api-lambda-dynamodb-sam/template.yaml b/cloudfront-apigw-rest-api-lambda-dynamodb-sam/template.yaml
index cc3e3caa1..b7d5e842a 100644
--- a/cloudfront-apigw-rest-api-lambda-dynamodb-sam/template.yaml
+++ b/cloudfront-apigw-rest-api-lambda-dynamodb-sam/template.yaml
@@ -78,12 +78,12 @@ Resources:
         WebACLId: !GetAtt CloudFrontWebACL.Arn
         Origins:
           - Id: s3
-            DomainName: !Join [ "", [ !Ref S3Bucket, ".s3.amazonaws.com" ] ]
+            DomainName: !Join [ "", [ !Ref S3Bucket, ".s3.${AWS::URLSuffix}" ] ]
             S3OriginConfig:
               OriginAccessIdentity:
                 !Join [ "", [ "origin-access-identity/cloudfront/", !Ref CloudFrontOriginAccessIdentity ] ]
           - Id: api
-            DomainName: !Sub "${API}.execute-api.${AWS::Region}.amazonaws.com"
+            DomainName: !Sub "${API}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
             OriginPath: /dev
             OriginCustomHeaders: 
               - HeaderName: "X-Origin-Verify"
diff --git a/cognito-httpapi/template.yaml b/cognito-httpapi/template.yaml
index 76b35ec08..b2b84143a 100644
--- a/cognito-httpapi/template.yaml
+++ b/cognito-httpapi/template.yaml
@@ -67,7 +67,7 @@ Resources:
 Outputs:
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
   AuthUrl:
     Description: Url used to authenticate
     Value: !GetAtt AuthStack.Outputs.AuthUrl
diff --git a/cognito-restapi/template.yaml b/cognito-restapi/template.yaml
index 7c2f8daa9..cdef8d12f 100644
--- a/cognito-restapi/template.yaml
+++ b/cognito-restapi/template.yaml
@@ -79,4 +79,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
\ No newline at end of file
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"
\ No newline at end of file
diff --git a/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c7ecdd25e..be4434c55 100644
Binary files a/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/cache.properties b/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/cache.properties
index 42627434c..fc328fd30 100644
--- a/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/cache.properties
+++ b/dynamodb-lambda-cdk-kotlin/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Fri May 02 11:44:08 BST 2025
-gradle.version=8.10
+#Tue Sep 09 13:42:34 CEST 2025
+gradle.version=9.0.0
diff --git a/eventbridge-cross-region/eventbus-source/template.yaml b/eventbridge-cross-region/eventbus-source/template.yaml
index ac0ab9853..261cb251c 100644
--- a/eventbridge-cross-region/eventbus-source/template.yaml
+++ b/eventbridge-cross-region/eventbus-source/template.yaml
@@ -124,4 +124,4 @@ Resources:
 Outputs:
   WebhookApiUrl:
     Description: "API Gateway HTTP API endpoint for webhook"
-    Value: !Sub "https://${ServerlessHttpApi}.execute-api.${AWS::Region}.amazonaws.com?region=<<region code>>"
+    Value: !Sub "https://${ServerlessHttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}?region=<<region code>>"
diff --git a/eventbridge-pipes-amazonmq-to-eventbridge-sam/template.yaml b/eventbridge-pipes-amazonmq-to-eventbridge-sam/template.yaml
index 70aae27b4..fe646526a 100644
--- a/eventbridge-pipes-amazonmq-to-eventbridge-sam/template.yaml
+++ b/eventbridge-pipes-amazonmq-to-eventbridge-sam/template.yaml
@@ -237,7 +237,7 @@ Outputs:
   # Output for the AmazonMQ Cluster
   MQBrokerManagementURI:
     Description: 'The AmazonMQ Web-Console URI. Please note: If deploying with MQPubliclyAccessible set to false, this will only be accessible from within the VPC.'
-    Value: !Sub 'https://${MQBroker}-1.mq.${AWS::Region}.amazonaws.com:8162'
+    Value: !Sub 'https://${MQBroker}-1.mq.${AWS::Region}.${AWS::URLSuffix}:8162'
   MQBrokerArn:
     Description: 'The ARN of the AmazonMQ cluster'
     Value: !GetAtt MQBroker.Arn
diff --git a/eventbridge-pipes-sqs-lambda-api-destination/template.yaml b/eventbridge-pipes-sqs-lambda-api-destination/template.yaml
index 318229970..9f302525d 100644
--- a/eventbridge-pipes-sqs-lambda-api-destination/template.yaml
+++ b/eventbridge-pipes-sqs-lambda-api-destination/template.yaml
@@ -61,7 +61,7 @@ Resources:
     Properties:
       Name: !Sub ${AWS::StackName}-api-destinations
       ConnectionArn: !GetAtt TargetConnection.Arn
-      InvocationEndpoint: !Sub "https://${TargetApiGateway}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+      InvocationEndpoint: !Sub "https://${TargetApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
       HttpMethod: POST 
       InvocationRateLimitPerSecond: 10
       
diff --git a/kinesis-data-stream-firehose-apigw-sam/template.yaml b/kinesis-data-stream-firehose-apigw-sam/template.yaml
index a5b1214e3..4299c37a5 100644
--- a/kinesis-data-stream-firehose-apigw-sam/template.yaml
+++ b/kinesis-data-stream-firehose-apigw-sam/template.yaml
@@ -123,7 +123,7 @@ Resources:
         RoleARN: !GetAtt MyKinesisFirehoseRole.Arn
       HttpEndpointDestinationConfiguration:
         EndpointConfiguration:
-          Url: !Sub "https://${MyApiGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/"
+          Url: !Sub "https://${MyApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/"
           AccessKey: '{{resolve:secretsmanager:KinesisFirehoseHttpEndpointAccessKey:SecretString}}'
         RoleARN: !GetAtt MyKinesisFirehoseRole.Arn
         BufferingHints:
@@ -143,7 +143,7 @@ Outputs:
   ApiEndpoint:
     Description: API Gateway endpoint URL
     Value:
-      Fn::Sub: "https://${MyApiGateway}.execute-api.${AWS::Region}.amazonaws.com/dev/"
+      Fn::Sub: "https://${MyApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev/"
   MyKinesisStream:
     Description: Kinesis Data Stream name
     Value: !Ref MyKinesisStream     
diff --git a/multi-account-private-apigw/accountA/template.yaml b/multi-account-private-apigw/accountA/template.yaml
index d6576932c..afd97c9b4 100644
--- a/multi-account-private-apigw/accountA/template.yaml
+++ b/multi-account-private-apigw/accountA/template.yaml
@@ -172,6 +172,6 @@ Outputs:
   ########### Outputs ###########
   ApiUrl:
     Description: "API Gateway Invoke URL"
-    Value: !Sub "https://${PrivateApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${PrivateApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
 
  
diff --git a/multi-account-private-apigw/accountB/template.yaml b/multi-account-private-apigw/accountB/template.yaml
index 3425302ee..7cc9b93f3 100644
--- a/multi-account-private-apigw/accountB/template.yaml
+++ b/multi-account-private-apigw/accountB/template.yaml
@@ -72,4 +72,4 @@ Resources:
 Outputs:
   ApiUrl:
     Description: API Gateway Invoke URL
-    Value: !Sub https://${PrivateApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/
\ No newline at end of file
+    Value: !Sub https://${PrivateApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/
\ No newline at end of file
diff --git a/public-nlb-or-alb-private-api-cfn/template.yaml b/public-nlb-or-alb-private-api-cfn/template.yaml
index c831b452f..ca753fcf9 100644
--- a/public-nlb-or-alb-private-api-cfn/template.yaml
+++ b/public-nlb-or-alb-private-api-cfn/template.yaml
@@ -410,12 +410,12 @@ Outputs:
   APIGatewayURL:
     Condition: SameAccCheck
     Value: !Sub 
-      - 'https://${ApiId}.execute-api.${AWS::Region}.amazonaws.com/v0/lambda'
+      - 'https://${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}/v0/lambda'
       - ApiId: !Ref ApiGatewayRestApi
   CURLCommand:  
     Condition: SameAccCheck
     Value: !Sub 
-      - "curl https://${CustomDomain}/${ApiGatewayStage}/lambda -H 'Host:${ApiId}.execute-api.${AWS::Region}.amazonaws.com'"
+      - "curl https://${CustomDomain}/${ApiGatewayStage}/lambda -H 'Host:${ApiId}.execute-api.${AWS::Region}.${AWS::URLSuffix}'"
       - CustomDomain: !Ref HostedZoneRecordSet
         ApiGatewayStage: !Ref ApiGatewayStage
         ApiId: !Ref ApiGatewayRestApi
\ No newline at end of file
diff --git a/rabbitmq-lambda-sam-java/template.yaml b/rabbitmq-lambda-sam-java/template.yaml
index 59d7e01fc..23b0bb9e6 100644
--- a/rabbitmq-lambda-sam-java/template.yaml
+++ b/rabbitmq-lambda-sam-java/template.yaml
@@ -79,7 +79,7 @@ Resources:
 Outputs:
   RabbitMQWebConsole:
     Description: The RabbitMQ web-console URL
-    Value: !Sub 'https://${MyMQBroker}.mq.${AWS::Region}.amazonaws.com/'
+    Value: !Sub 'https://${MyMQBroker}.mq.${AWS::Region}.${AWS::URLSuffix}/'
 
   MyMQMessageHandlerFunction:
     Description: The name of the RabbitMQ message handler function
diff --git a/s3-lambda-bedrock-aoss/template.yaml b/s3-lambda-bedrock-aoss/template.yaml
index 7cab384a5..f1284572a 100644
--- a/s3-lambda-bedrock-aoss/template.yaml
+++ b/s3-lambda-bedrock-aoss/template.yaml
@@ -29,7 +29,7 @@ Resources:
     Properties:
       ServiceToken: !GetAtt IndexCreationLambdaFunction.Arn
       AOSSIndexName: !Ref AmazonOpenSearchIndexName
-      AOSSHost: !Sub '${ExampleCollection.Id}.${AWS::Region}.aoss.amazonaws.com'
+      AOSSHost: !Sub '${ExampleCollection.Id}.${AWS::Region}.aoss.${AWS::URLSuffix}'
 
   IndexCreationLambdaExecutionRole: 
     Type: AWS::IAM::Role
@@ -138,7 +138,7 @@ Resources:
             BucketName: !Ref SourceBucket
       Environment:
         Variables:
-          AOS_HOST: !Sub '${ExampleCollection.Id}.${AWS::Region}.aoss.amazonaws.com'
+          AOS_HOST: !Sub '${ExampleCollection.Id}.${AWS::Region}.aoss.${AWS::URLSuffix}'
           BEDROCK_MODEL_REGION: !Ref BedrockModelRegion
           AOSS_INDEX_NAME:  !Ref AmazonOpenSearchIndexName
       Layers:
diff --git a/sam-webapp-cognito/template.yaml b/sam-webapp-cognito/template.yaml
index 695a10eaa..b8a2d1fa3 100644
--- a/sam-webapp-cognito/template.yaml
+++ b/sam-webapp-cognito/template.yaml
@@ -61,7 +61,7 @@ Resources:
             OriginAccessControlId: !GetAtt CloudFrontOriginAccessControl.Id
           # Origin for api
           - Id: api
-            DomainName: !Sub "${HttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+            DomainName: !Sub "${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
             CustomOriginConfig:
               HTTPSPort: 443
               OriginProtocolPolicy: https-only
@@ -168,7 +168,7 @@ Resources:
           OAuth2Authorizer:
             IdentitySource: "$request.header.Authorization"
             JwtConfiguration:
-              issuer: !Sub https://cognito-idp.${AWS::Region}.amazonaws.com/${UserPool}
+              issuer: !Sub https://cognito-idp.${AWS::Region}.${AWS::URLSuffix}/${UserPool}
               audience:
                 - !Ref UserPoolClient
         DefaultAuthorizer: OAuth2Authorizer
@@ -210,10 +210,10 @@ Outputs:
       Name: "UserPoolClient::Id"
   Issuer:
     Description: "Url used for issuer on HTTP API JWT tokens"
-    Value: !Sub https://cognito-idp.${AWS::Region}.amazonaws.com/${UserPool}
+    Value: !Sub https://cognito-idp.${AWS::Region}.${AWS::URLSuffix}/${UserPool}
   DynamoDbTable:
     Value: !Ref DynamoTable
     Description: DynamoDb Table
   HttpApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.amazonaws.com"
+    Value: !Sub "https://${HttpApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
diff --git a/serverless-message-processing/template.yaml b/serverless-message-processing/template.yaml
index 5f839e530..c6bcef2af 100644
--- a/serverless-message-processing/template.yaml
+++ b/serverless-message-processing/template.yaml
@@ -205,7 +205,7 @@ Resources:
 Outputs:
   ApiEndpoint:
     Description: API Gateway endpoint URL
-    Value: !Sub "https://${ApiGateway}.execute-api.${AWS::Region}.amazonaws.com/prod/message"
+    Value: !Sub "https://${ApiGateway}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/message"
 
   MainQueueUrl:
     Description: URL of the main SQS queue
diff --git a/serverless-multi-tenant-api/template.yaml b/serverless-multi-tenant-api/template.yaml
index 97f73d817..a99e3be6b 100644
--- a/serverless-multi-tenant-api/template.yaml
+++ b/serverless-multi-tenant-api/template.yaml
@@ -189,7 +189,7 @@ Resources:
 Outputs:
   WebEndpoint:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
   TestApiKeyOutput:
     Description: "API Key"
     Value: !Ref TestApiKey
diff --git a/sfn-apigw/template.yaml b/sfn-apigw/template.yaml
index 05f106d69..827a4266e 100644
--- a/sfn-apigw/template.yaml
+++ b/sfn-apigw/template.yaml
@@ -14,7 +14,7 @@ Resources:
       DefinitionUri: statemachine/stateMachine.asl.json
       DefinitionSubstitutions:
          DefaultPath: '/'
-         APIEndPoint: !Sub "${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com"
+         APIEndPoint: !Sub "${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}"
       Role:
         Fn::GetAtt: [ StatesExecutionRole, Arn ]
       Logging:
@@ -89,4 +89,4 @@ Outputs:
     Description: StateMachinetoAPIGW Arn
   WebEndpoint:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
diff --git a/sqs-ecs-autoscaling/template.yaml b/sqs-ecs-autoscaling/template.yaml
index 08e02e63c..13fde38d0 100644
--- a/sqs-ecs-autoscaling/template.yaml
+++ b/sqs-ecs-autoscaling/template.yaml
@@ -270,7 +270,7 @@ Resources:
         - - service
           - !Ref ECSCluster
           - !GetAtt ECSService.Name
-      RoleARN: !Sub arn:aws:iam::${AWS::AccountId}:role/aws-service-role/ecs.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_ECSService
+      RoleARN: !Sub arn:aws:iam::${AWS::AccountId}:role/aws-service-role/ecs.application-autoscaling.${AWS::URLSuffix}/AWSServiceRoleForApplicationAutoScaling_ECSService
       ScalableDimension: ecs:service:DesiredCount
       ServiceNamespace: ecs
 
diff --git a/stepfunctions-sns-apigw-human-review/template.yaml b/stepfunctions-sns-apigw-human-review/template.yaml
index d9ddb7f6d..b45a68cf9 100644
--- a/stepfunctions-sns-apigw-human-review/template.yaml
+++ b/stepfunctions-sns-apigw-human-review/template.yaml
@@ -84,7 +84,7 @@ Resources:
       DefinitionUri: "./StepFunction/step-function-definition.json"
       DefinitionSubstitutions:
         TopicArn: !GetAtt SNSNotificationTopic.TopicArn
-        ApiEndpoint: !Sub https://${ReviewRESTApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+        ApiEndpoint: !Sub https://${ReviewRESTApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod
       Role: !GetAtt ReviewSfnRole.Arn
     Metadata:
       SamResourceId: "ReviewStateMachine"
diff --git a/waf-apigw-rest/template.yaml b/waf-apigw-rest/template.yaml
index 2b41c6dd4..13df88a5e 100644
--- a/waf-apigw-rest/template.yaml
+++ b/waf-apigw-rest/template.yaml
@@ -70,4 +70,4 @@ Outputs:
   # API endpoint for testing
   ApiEndpoint:
     Description: "API endpoint URL"
-    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod