diff --git a/docs/safe_lambda_deployments.rst b/docs/safe_lambda_deployments.rst
index 73d70f86e..c6c4b1454 100644
--- a/docs/safe_lambda_deployments.rst
+++ b/docs/safe_lambda_deployments.rst
@@ -156,7 +156,7 @@ resource:
             Action:
               - "codedeploy:PutLifecycleEventHookExecutionStatus"
             Resource:
-              !Sub 'arn:aws:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup:${ServerlessDeploymentApplication}/*'
+              !Sub 'arn:${AWS::Partition}:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup:${ServerlessDeploymentApplication}/*'
         - Version: "2012-10-17"
           Statement:
           - Effect: "Allow"
diff --git a/examples/2016-10-31/api_cognito_auth/template.yaml b/examples/2016-10-31/api_cognito_auth/template.yaml
index 60e4badd1..b1dc1dacc 100644
--- a/examples/2016-10-31/api_cognito_auth/template.yaml
+++ b/examples/2016-10-31/api_cognito_auth/template.yaml
@@ -131,7 +131,7 @@ Resources:
       Action: lambda:InvokeFunction
       FunctionName: !GetAtt PreSignupLambdaFunction.Arn
       Principal: cognito-idp.amazonaws.com
-      SourceArn: !Sub 'arn:aws:cognito-idp:${AWS::Region}:${AWS::AccountId}:userpool/${MyCognitoUserPool}'
+      SourceArn: !Sub 'arn:${AWS::Partition}:cognito-idp:${AWS::Region}:${AWS::AccountId}:userpool/${MyCognitoUserPool}'
       # TODO: Add a CognitoUserPool Event Source to SAM to create this permission for you.
       # Events:
       #   CognitoUserPoolPreSignup:
diff --git a/examples/2016-10-31/inline_swagger/template.yaml b/examples/2016-10-31/inline_swagger/template.yaml
index aeba9d4ad..3339eafee 100644
--- a/examples/2016-10-31/inline_swagger/template.yaml
+++ b/examples/2016-10-31/inline_swagger/template.yaml
@@ -18,7 +18,7 @@ Resources:
                     httpMethod: POST
                     type: aws_proxy
                     uri:
-                      Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
+                      Fn::Sub: arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
                   responses: {}
 
 
diff --git a/examples/2016-10-31/lambda_safe_deployments/template.yaml b/examples/2016-10-31/lambda_safe_deployments/template.yaml
index ebb0e44ab..586824c28 100644
--- a/examples/2016-10-31/lambda_safe_deployments/template.yaml
+++ b/examples/2016-10-31/lambda_safe_deployments/template.yaml
@@ -28,7 +28,7 @@ Resources:
             Action:
               - "codedeploy:PutLifecycleEventHookExecutionStatus"
             Resource:
-              !Sub 'arn:aws:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup:${ServerlessDeploymentApplication}/*'
+              !Sub 'arn:${AWS::Partition}:codedeploy:${AWS::Region}:${AWS::AccountId}:deploymentgroup:${ServerlessDeploymentApplication}/*'
         - Version: "2012-10-17"
           Statement:
           - Effect: "Allow"
diff --git a/versions/2016-10-31.md b/versions/2016-10-31.md
index 8d000a324..d8432f808 100644
--- a/versions/2016-10-31.md
+++ b/versions/2016-10-31.md
@@ -200,7 +200,7 @@ Tags:
   AppNameTag: ThumbnailApp
   DepartmentNameTag: ThumbnailDepartment
 Layers:
-  - !Sub arn:aws:lambda:${AWS::Region}:123456789012:layer:MyLayer:1
+  - !Sub arn:${AWS::Partition}:lambda:${AWS::Region}:123456789012:layer:MyLayer:1
 ```
 
 #### AWS::Serverless::Api