diff --git a/dist/cloudformation-stack-ttl.yml b/dist/cloudformation-stack-ttl.yml
index 61adb86b..dccf0d7e 100644
--- a/dist/cloudformation-stack-ttl.yml
+++ b/dist/cloudformation-stack-ttl.yml
@@ -130,7 +130,7 @@ Resources:
   GenerateCronExpLambda:
     Type: "AWS::Lambda::Function"
     Properties:
-      FunctionName: !Join [ "", [ 'GenerateCronExpLambda', !Ref BUILDID ] ]
+      FunctionName: !Sub "MakeCronLambda-${StackName}"
       Code:
         ZipFile: |
           from datetime import datetime, timedelta