diff --git a/services/app-api/serverless.yml b/services/app-api/serverless.yml
index c74527b0c..e3f6cd292 100644
--- a/services/app-api/serverless.yml
+++ b/services/app-api/serverless.yml
@@ -95,9 +95,9 @@ provider:
   name: aws
   runtime: nodejs20.x
   region: us-east-1
-  stackTags:  
+  stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
   tracing:
     apiGateway: true
   logs:
@@ -646,6 +646,9 @@ resources:
           gatewayresponse.header.Access-Control-Allow-Headers: "'*'"
         ResponseType: DEFAULT_5XX
         RestApiId: !Ref ApiGatewayRestApi
+    ApiGatewayLogGroup:
+      Type: AWS::Logs::LogGroup
+      DeletionPolicy: Retain
 
   Outputs:
     ApiGatewayRestApiName:
diff --git a/services/ui-waflog-s3-bucket/serverless.yml b/services/ui-waflog-s3-bucket/serverless.yml
index fffbef418..c5f492bbb 100644
--- a/services/ui-waflog-s3-bucket/serverless.yml
+++ b/services/ui-waflog-s3-bucket/serverless.yml
@@ -10,9 +10,9 @@ provider:
   name: aws
   runtime: nodejs20.x
   region: us-east-1
-  stackTags:  
+  stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
 
 custom:
   project: "seds"
@@ -32,6 +32,7 @@ resources:
   Resources:
     WaflogsUploadBucket:
       Type: AWS::S3::Bucket
+      DeletionPolicy: Retain
       Properties:
         BucketName: !Sub ${AWS::AccountId}-${self:custom.stage}-waflogs
         BucketEncryption:
diff --git a/services/ui/serverless.yml b/services/ui/serverless.yml
index 9aa4aac9f..1edee442d 100644
--- a/services/ui/serverless.yml
+++ b/services/ui/serverless.yml
@@ -11,9 +11,9 @@ provider:
   name: aws
   runtime: nodejs20.x
   region: us-east-1
-  stackTags:  
+  stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
 
 custom:
   project: "seds"
@@ -168,7 +168,8 @@ resources:
                   aws:SecureTransport: false
         Bucket: !Ref S3Bucket
     LoggingBucket:
-      Type: "AWS::S3::Bucket"
+      Type: AWS::S3::Bucket
+      DeletionPolicy: Retain
       Properties:
         BucketName: !Sub ${self:service}-${self:custom.stage}-cloudfront-logs-${AWS::AccountId}
         PublicAccessBlockConfiguration:
@@ -183,7 +184,6 @@ resources:
         OwnershipControls:
           Rules:
             - ObjectOwnership: BucketOwnerPreferred
-      DeletionPolicy: Delete
     LoggingBucketPolicy:
       Type: "AWS::S3::BucketPolicy"
       Properties: