diff --git a/src/configurations/destinations/ga4_v2/ui-config.json b/src/configurations/destinations/ga4_v2/ui-config.json
index 63eff9a6e..a3f99fa54 100644
--- a/src/configurations/destinations/ga4_v2/ui-config.json
+++ b/src/configurations/destinations/ga4_v2/ui-config.json
@@ -2156,4 +2156,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/configurations/sources/s3/db-config.json b/src/configurations/sources/s3/db-config.json
index 7247ab93d..4053deb45 100644
--- a/src/configurations/sources/s3/db-config.json
+++ b/src/configurations/sources/s3/db-config.json
@@ -4,7 +4,8 @@
   "displayName": "Amazon S3",
   "options": {
     "skipWarehouseSchemaConfig": true,
-    "isCredentialsValidationSupported": true
+    "isCredentialsValidationSupported": true,
+    "syncReportType": "file"
   },
   "type": "warehouse"
 }
diff --git a/src/configurations/sources/s3/schema.json b/src/configurations/sources/s3/schema.json
index fddffa4cc..548c69d13 100644
--- a/src/configurations/sources/s3/schema.json
+++ b/src/configurations/sources/s3/schema.json
@@ -1,3 +1,52 @@
 {
-  "configSchema": null
+  "configSchema": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "required": [],
+    "type": "object",
+    "properties": {},
+    "oneOf": [
+      {
+        "if": {
+          "properties": {
+            "connectionMode": {
+              "const": "accessKey"
+            }
+          },
+          "required": ["connectionMode"]
+        },
+        "then": {
+          "properties": {
+            "accessKeyID": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            },
+            "accessKey": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            }
+          },
+          "required": ["accessKeyID", "accessKey"]
+        }
+      },
+      {
+        "if": {
+          "properties": {
+            "connectionMode": {
+              "const": "crossAccountRole"
+            }
+          },
+          "required": ["connectionMode"]
+        },
+        "then": {
+          "properties": {
+            "roleARN": {
+              "type": "string",
+              "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
+            }
+          },
+          "required": ["roleARN"]
+        }
+      }
+    ]
+  }
 }