diff --git a/scan-triggers/aws-python-bucket-full-and-scheduled-scan/template.yaml b/scan-triggers/aws-python-bucket-full-and-scheduled-scan/template.yaml
index df3137c6..72a0d9f0 100644
--- a/scan-triggers/aws-python-bucket-full-and-scheduled-scan/template.yaml
+++ b/scan-triggers/aws-python-bucket-full-and-scheduled-scan/template.yaml
@@ -689,7 +689,9 @@ Resources:
             - Ref: AWS::Region
             - ":"
             - Ref: AWS::AccountId
-            - ":stateMachine:ScannerLoopStateMachine\",
+            - ":stateMachine:ScannerLoopSM-"
+            - Ref: BucketName
+            - "\",
 
               \                      \"Input\": {
 
@@ -736,7 +738,11 @@ Resources:
               \      }
 
               \      "
-      StateMachineName: ScannerLoopStateMachine
+      StateMachineName:
+        Fn::Join:
+          - ""
+          - - ScannerLoopSM-
+            - Ref: BucketName
   FullScanStarterExecutionRole:
     Type: AWS::IAM::Role
     Properties:
@@ -856,7 +862,11 @@ Resources:
               \      }
 
               \      "
-      StateMachineName: fullScanStarterStateMachine
+      StateMachineName:
+        Fn::Join:
+          - ""
+          - - fullScanSSM-
+            - Ref: BucketName
     DependsOn:
       - FullScanStarterExecutionRoleDefaultPolicy
       - FullScanStarterExecutionRole
@@ -913,4 +923,5 @@ Outputs:
           - Ref: AWS::Region
           - ":"
           - Ref: AWS::AccountId
-          - :stateMachine:fullScanStarterStateMachine
+          - :stateMachine:fullScanSSM-
+          - Ref: BucketName