diff --git a/crates/router/src/configs/defaults/payment_connector_required_fields.rs b/crates/router/src/configs/defaults/payment_connector_required_fields.rs
index 0954ac51c7df..9e42aec4a51d 100644
--- a/crates/router/src/configs/defaults/payment_connector_required_fields.rs
+++ b/crates/router/src/configs/defaults/payment_connector_required_fields.rs
@@ -8142,7 +8142,8 @@ impl Default for settings::RequiredFields {
                                     enums::Connector::Bankofamerica,
                                     RequiredFieldFinal {
                                         mandate: HashMap::new(),
-                                        non_mandate: HashMap::from(
+                                        non_mandate: HashMap::new(),
+                                        common: HashMap::from(
                                             [
                                                 (
                                                     "email".to_string(),
@@ -8222,14 +8223,14 @@ impl Default for settings::RequiredFields {
                                                 )
                                             ]
                                         ),
-                                        common: HashMap::new(),
                                     }
                                 ),
                                 (
                                     enums::Connector::Cybersource,
                                     RequiredFieldFinal {
                                         mandate: HashMap::new(),
-                                        non_mandate: HashMap::from(
+                                        non_mandate: HashMap::new(),
+                                        common: HashMap::from(
                                             [
                                                 (
                                                     "billing.email".to_string(),
@@ -8309,7 +8310,6 @@ impl Default for settings::RequiredFields {
                                                 )
                                             ]
                                         ),
-                                        common: HashMap::new(),
                                     }
                                 ),
                                 (
@@ -8524,7 +8524,8 @@ impl Default for settings::RequiredFields {
                                     enums::Connector::Bankofamerica,
                                     RequiredFieldFinal {
                                         mandate: HashMap::new(),
-                                        non_mandate: HashMap::from(
+                                        non_mandate: HashMap::new(),
+                                        common:  HashMap::from(
                                             [
                                                 (
                                                     "email".to_string(),
@@ -8604,7 +8605,6 @@ impl Default for settings::RequiredFields {
                                                 )
                                             ]
                                         ),
-                                        common: HashMap::new(),
                                     }
                                 ),
                                 (
@@ -8789,7 +8789,8 @@ impl Default for settings::RequiredFields {
                                     enums::Connector::Cybersource,
                                     RequiredFieldFinal {
                                         mandate: HashMap::new(),
-                                        non_mandate: HashMap::from(
+                                        non_mandate: HashMap::new(),
+                                        common: HashMap::from(
                                             [
                                                 (
                                                     "billing.email".to_string(),
@@ -8869,7 +8870,6 @@ impl Default for settings::RequiredFields {
                                                 )
                                             ]
                                         ),
-                                        common: HashMap::new(),
                                     }
                                 ),
                                 (