diff --git a/src/cirrus/builtins/feeders/feed-rerun/definition.yml b/src/cirrus/builtins/feeders/feed-rerun/definition.yml
index 83be7eec..c6f620f8 100644
--- a/src/cirrus/builtins/feeders/feed-rerun/definition.yml
+++ b/src/cirrus/builtins/feeders/feed-rerun/definition.yml
@@ -2,6 +2,7 @@ description: Rerun items in the database
 lambda:
   memorySize: 128
   timeout: 900
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:
diff --git a/src/cirrus/builtins/functions/api/definition.yml b/src/cirrus/builtins/functions/api/definition.yml
index 15d72642..7b4a433b 100644
--- a/src/cirrus/builtins/functions/api/definition.yml
+++ b/src/cirrus/builtins/functions/api/definition.yml
@@ -2,6 +2,7 @@ description: Cirrus API
 lambda:
   memorySize: 128
   timeout: 10
+  handler: lambda_function.lambda_handler
   events:
     - http: GET /
     - http: GET /{proxy+}
diff --git a/src/cirrus/builtins/functions/process/definition.yml b/src/cirrus/builtins/functions/process/definition.yml
index f9569cce..ce45a66c 100644
--- a/src/cirrus/builtins/functions/process/definition.yml
+++ b/src/cirrus/builtins/functions/process/definition.yml
@@ -5,6 +5,7 @@ environment:
 lambda:
   memorySize: 128
   timeout: 900
+  handler: lambda_function.lambda_handler
   events:
     - sqs:
         arn: !GetAtt ProcessQueue.Arn
diff --git a/src/cirrus/builtins/functions/update-state/definition.yml b/src/cirrus/builtins/functions/update-state/definition.yml
index 6a88f50d..5ed13131 100644
--- a/src/cirrus/builtins/functions/update-state/definition.yml
+++ b/src/cirrus/builtins/functions/update-state/definition.yml
@@ -2,6 +2,7 @@ description: update the cirrus database with the execution state
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   events:
     - eventBridge:
         pattern:
diff --git a/src/cirrus/builtins/tasks/post-batch/definition.yml b/src/cirrus/builtins/tasks/post-batch/definition.yml
index 5f97b00b..6f5a91ea 100644
--- a/src/cirrus/builtins/tasks/post-batch/definition.yml
+++ b/src/cirrus/builtins/tasks/post-batch/definition.yml
@@ -2,6 +2,7 @@ description: Post process batch job by copying input from S3
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:
diff --git a/src/cirrus/builtins/tasks/pre-batch/definition.yml b/src/cirrus/builtins/tasks/pre-batch/definition.yml
index 6b9961a5..0fba9378 100644
--- a/src/cirrus/builtins/tasks/pre-batch/definition.yml
+++ b/src/cirrus/builtins/tasks/pre-batch/definition.yml
@@ -2,6 +2,7 @@ description: Pre process batch job by copying input to S3
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:
diff --git a/src/cirrus/builtins/tasks/publish/definition.yml b/src/cirrus/builtins/tasks/publish/definition.yml
index bcba9c3e..b3432299 100644
--- a/src/cirrus/builtins/tasks/publish/definition.yml
+++ b/src/cirrus/builtins/tasks/publish/definition.yml
@@ -2,6 +2,7 @@ description: Publish resulting STAC Collections and Items to catalog, and option
 lambda:
   memorySize: 128
   timeout: 30
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:
diff --git a/src/cirrus/core/components/base/_lambda.py b/src/cirrus/core/components/base/_lambda.py
index a806a6f5..683b2157 100644
--- a/src/cirrus/core/components/base/_lambda.py
+++ b/src/cirrus/core/components/base/_lambda.py
@@ -63,10 +63,11 @@ def load_config(self):
             + project_reqs
         }))
 
-        if not hasattr(self.lambda_config, 'module'):
+        # if this is a non-container lambda that needs to be packaged
+        # by serverless, then we need to ensure the module points to the
+        # place in the build dir where we'll copy all the code
+        if hasattr(self.lambda_config, 'handler'):
             self.lambda_config.module = f'lambdas/{self.name}'
-        if not hasattr(self.lambda_config, 'handler'):
-            self.lambda_config.handler = 'lambda_function.lambda_handler'
 
     @property
     def enabled(self):
diff --git a/src/cirrus/core/components/files/definitions.py b/src/cirrus/core/components/files/definitions.py
index 50e0712d..95dad3b4 100644
--- a/src/cirrus/core/components/files/definitions.py
+++ b/src/cirrus/core/components/files/definitions.py
@@ -33,6 +33,7 @@
 lambda_lambda = '''lambda:
   memorySize: 128
   timeout: 60
+  handler: lambda_function.lambda_handler
   pythonRequirements:
     include: []
 '''.format