diff --git a/roles/aws/aws_backup_validation/tasks/main.yml b/roles/aws/aws_backup_validation/tasks/main.yml
index 9696300f1..b9c3b6087 100644
--- a/roles/aws/aws_backup_validation/tasks/main.yml
+++ b/roles/aws/aws_backup_validation/tasks/main.yml
@@ -45,7 +45,8 @@
   block:
     - name: Create S3 bucket for lambda functions
       amazon.aws.s3_bucket:
-        name: "codeenigma-{{ _aws_profile }}-lambda-functions-storage"
+        name: "codeenigma-{{ _aws_profile }}-general-storage"
+        region: "{{ _aws_region }}"
         state: present
 
     - name: Check and clean any previous backup validation files
@@ -85,16 +86,16 @@
 
     - name: Place backup validation functions in S3 bucket
       amazon.aws.s3_object:
-        bucket: "codeenigma-{{ _aws_profile }}-lambda-functions-storage"
-        object: "{{ item }}_validation.zip"
+        bucket: "codeenigma-{{ _aws_profile }}-general-storage"
+        object: "lambda-functions/{{ item }}_validation.zip"
         src: "{{ _ce_provision_build_dir }}/{{ item }}_validation.zip"
         mode: put
       loop: "{{ aws_backup_validation.resources }}"
 
     - name: Place report function in S3 bucket
       amazon.aws.s3_object:
-        bucket: "codeenigma-{{ _aws_profile }}-lambda-functions-storage"
-        object: "validation_report.zip"
+        bucket: "codeenigma-{{ _aws_profile }}-general-storage"
+        object: "lambda-functions/validation_report.zip"
         src: "{{ _ce_provision_build_dir }}/validation_report.zip"
         mode: put
       loop: "{{ aws_backup_validation.resources }}"
@@ -105,8 +106,8 @@
     description: "{{ aws_backup_validation.description }} {{ item }} new comment to update function"
     region: "{{ _aws_region }}"
     timeout: "{{ aws_backup_validation.timeout }}"
-    s3_bucket: "s3://codeenigma-{{ _aws_profile }}-lambda-functions-storage"
-    s3_key: "{{ item }}_validation.zip"
+    s3_bucket: "https://codeenigma-{{ _aws_profile }}-general-storage.s3.{{ _aws_region }}.amazonaws.com"
+    s3_key: "lambda-functions/{{ item }}_validation.zip"
     state: present
     runtime: "{{ aws_backup_validation.runtime }}"
     role: "{{ _created_iam_lambda_role.iam_role.arn }}"
@@ -122,8 +123,8 @@
     description: "Function that will send report about previous validations"
     region: "{{ _aws_region }}"
     timeout: 30
-    s3_bucket: "s3://codeenigma-{{ _aws_profile }}-lambda-functions-storage"
-    s3_key: "validation_report.zip"
+    s3_bucket: "https://codeenigma-{{ _aws_profile }}-general-storage.s3.{{ _aws_region }}.amazonaws.com"
+    s3_key: "lambda-functions/validation_report.zip"
     state: present
     runtime: "{{ aws_backup_validation.runtime }}"
     role: "{{ _created_iam_lambda_role.iam_role.arn }}"