diff --git a/api/dependencies/requirements.txt b/api/dependencies/requirements.txt
index ca7cfa0..08b42ac 100644
--- a/api/dependencies/requirements.txt
+++ b/api/dependencies/requirements.txt
@@ -1,3 +1,4 @@
+aws-lambda-powertools[tracer,parser]==3.4.0
 cryptography==43.0.3
 hpke==0.3.2
 pksuid==1.1.2
diff --git a/api/template.yml b/api/template.yml
index e680cfe..36cfaa6 100644
--- a/api/template.yml
+++ b/api/template.yml
@@ -388,7 +388,6 @@ Resources:
       Handler: app.lambda_handler.handler
       Layers:
         - !Ref rDependencyLayer
-        - "{{resolve:ssm:/aws/service/powertools/python/arm64/python3.13/latest}}"
       MemorySize: 1024 # megabytes
       PropagateTags: true
       Role: !GetAtt rApiFunctionRole.Arn
diff --git a/canary/template.yml b/canary/template.yml
index 27fe91e..ba50eda 100644
--- a/canary/template.yml
+++ b/canary/template.yml
@@ -48,8 +48,7 @@ Globals:
         TABLE_NAME: !Ref pTableName
     Handler: app.lambda_handler.handler
     Layers:
-      #- !Ref rDependencyLayer
-      - "{{resolve:ssm:/aws/service/powertools/python/arm64/python3.13/latest}}"
+      - !Ref rDependencyLayer
     MemorySize: 128  # megabytes
     PropagateTags: true
     ReservedConcurrentExecutions: 1
@@ -295,20 +294,20 @@ Resources:
       Roles:
         - !Ref rEventBridgeSchedulerRole
 
-  #rDependencyLayer:
-  #  Type: "AWS::Serverless::LayerVersion"
-  #  Metadata:
-  #    BuildMethod: python3.12
-  #    BuildArchitecture: arm64
-  #  Properties:
-  #    LicenseInfo: MIT-0
-  #    CompatibleArchitectures:
-  #      - arm64
-  #    CompatibleRuntimes:
-  #      - python3.12
-  #    ContentUri: dependencies
-  #    Description: !Sub "DO NOT DELETE - ${AWS::StackName} - Python Dependencies"
-  #    RetentionPolicy: Delete
+  rDependencyLayer:
+    Type: "AWS::Serverless::LayerVersion"
+    Metadata:
+      BuildMethod: python3.13
+      BuildArchitecture: arm64
+    Properties:
+      LicenseInfo: MIT-0
+      CompatibleArchitectures:
+        - arm64
+      CompatibleRuntimes:
+        - python3.13
+      ContentUri: dependencies
+      Description: !Sub "DO NOT DELETE - ${AWS::StackName} - Python Dependencies"
+      RetentionPolicy: Delete
 
   rCanaryVpcFunction:
     Type: "AWS::Serverless::Function"
diff --git a/ci_template.yml b/ci_template.yml
index 7778e11..ef7b021 100644
--- a/ci_template.yml
+++ b/ci_template.yml
@@ -1041,7 +1041,7 @@ Resources:
       Source:
         BuildSpec: buildspec.yml
         Type: CODEPIPELINE
-      TimeoutInMinutes: 30
+      TimeoutInMinutes: 20
 
   rApiCodeBuildProject:
     Type: "AWS::CodeBuild::Project"
@@ -1077,7 +1077,7 @@ Resources:
       Source:
         BuildSpec: api/buildspec.yml
         Type: CODEPIPELINE
-      TimeoutInMinutes: 5
+      TimeoutInMinutes: 10
 
   rCanaryCodeBuildProject:
     Type: "AWS::CodeBuild::Project"
@@ -1113,7 +1113,7 @@ Resources:
       Source:
         BuildSpec: canary/buildspec.yml
         Type: CODEPIPELINE
-      TimeoutInMinutes: 5
+      TimeoutInMinutes: 10
 
   rStepFunctionsRole:
     Type: "AWS::IAM::Role"