diff --git a/config/config.example.toml b/config/config.example.toml
index d935a4e7f20d..12b7194409bd 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -122,7 +122,7 @@ kms_encrypted_recon_admin_api_key = ""   # Base64-encoded (KMS encrypted) cipher
 # like card details
 [locker]
 host = ""                      # Locker host
-host_rs = ""                   # Rust Locker host 
+host_rs = ""                   # Rust Locker host
 mock_locker = true             # Emulate a locker locally using Postgres
 basilisk_host = ""             # Basilisk host
 locker_signing_key_id = "1"    # Key_id to sign basilisk hs locker
@@ -460,6 +460,10 @@ apple_pay_merchant_cert_key = "APPLE_PAY_MERCHNAT_CERTIFICATE_KEY" #Private key
 [payment_link]
 sdk_url = "http://localhost:9090/dist/HyperLoader.js"
 
+[payment_method_auth]
+redis_expiry = 900
+pm_auth_key = "Some_pm_auth_key"
+
 # Analytics configuration.
 [analytics]
 source = "sqlx" # The Analytics source/strategy to be used
diff --git a/config/development.toml b/config/development.toml
index 192e974c0a70..abb622bd8263 100644
--- a/config/development.toml
+++ b/config/development.toml
@@ -243,7 +243,7 @@ adyen = { banks = "blik_psp,place_zipko,m_bank,pay_with_ing,santander_przelew24,
 stripe = { banks = "alior_bank,bank_millennium,bank_nowy_bfg_sa,bank_pekao_sa,banki_spbdzielcze,blik,bnp_paribas,boz,citi,credit_agricole,e_transfer_pocztowy24,getin_bank,idea_bank,inteligo,mbank_mtransfer,nest_przelew,noble_pay,pbac_z_ipko,plus_bank,santander_przelew24,toyota_bank,volkswagen_bank" }
 
 [bank_config.open_banking_uk]
-adyen = { banks = "aib,bank_of_scotland,danske_bank,first_direct,first_trust,halifax,lloyds,monzo,nat_west,nationwide_bank,royal_bank_of_scotland,starling,tsb_bank,tesco_bank,ulster_bank,barclays,hsbc_bank,revolut,santander_przelew24,open_bank_success,open_bank_failure,open_bank_cancelled" }
+adyen = { banks = "aib,bank_of_scotland,danske_bank,first_direct,first_trust,halifax,lloyds,monzo,nat_west,nationwide_bank,royal_bank_of_scotland,starling,tsb_bank,tesco_bank,ulster_bank,barclays,hsbc_bank,revolut,santander_przelew24,open_bank_success,open_bank_failure,open_bank_cancelled"}
 
 [bank_config.online_banking_fpx]
 adyen.banks = "affin_bank,agro_bank,alliance_bank,am_bank,bank_islam,bank_muamalat,bank_rakyat,bank_simpanan_nasional,cimb_bank,hong_leong_bank,hsbc_bank,kuwait_finance_house,may_bank,ocbc_bank,public_bank,rhb_bank,standard_chartered_bank,uob_bank"
@@ -292,45 +292,45 @@ giropay = { country = "DE", currency = "EUR" }
 eps = { country = "AT", currency = "EUR" }
 sofort = { country = "ES,UK,SE,AT,NL,DE,CH,BE,FR,FI,IT,PL", currency = "EUR" }
 ideal = { country = "NL", currency = "EUR" }
-blik = { country = "PL", currency = "PLN" }
-trustly = { country = "ES,UK,SE,NO,AT,NL,DE,DK,FI,EE,LT,LV", currency = "CZK,DKK,EUR,GBP,NOK,SEK" }
-online_banking_czech_republic = { country = "CZ", currency = "EUR,CZK" }
-online_banking_finland = { country = "FI", currency = "EUR" }
-online_banking_poland = { country = "PL", currency = "PLN" }
-online_banking_slovakia = { country = "SK", currency = "EUR,CZK" }
-bancontact_card = { country = "BE", currency = "EUR" }
-ach = { country = "US", currency = "USD" }
-bacs = { country = "UK", currency = "GBP" }
-sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT", currency = "EUR" }
-ali_pay_hk = { country = "HK", currency = "HKD" }
-bizum = { country = "ES", currency = "EUR" }
-go_pay = { country = "ID", currency = "IDR" }
-kakao_pay = { country = "KR", currency = "KRW" }
-momo = { country = "VN", currency = "VND" }
-gcash = { country = "PH", currency = "PHP" }
-online_banking_fpx = { country = "MY", currency = "MYR" }
-online_banking_thailand = { country = "TH", currency = "THB" }
-touch_n_go = { country = "MY", currency = "MYR" }
-atome = { country = "MY,SG", currency = "MYR,SGD" }
-swish = { country = "SE", currency = "SEK" }
-permata_bank_transfer = { country = "ID", currency = "IDR" }
-bca_bank_transfer = { country = "ID", currency = "IDR" }
-bni_va = { country = "ID", currency = "IDR" }
-bri_va = { country = "ID", currency = "IDR" }
-cimb_va = { country = "ID", currency = "IDR" }
-danamon_va = { country = "ID", currency = "IDR" }
-mandiri_va = { country = "ID", currency = "IDR" }
-alfamart = { country = "ID", currency = "IDR" }
-indomaret = { country = "ID", currency = "IDR" }
-open_banking_uk = { country = "GB", currency = "GBP" }
-oxxo = { country = "MX", currency = "MXN" }
-pay_safe_card = { country = "AT,AU,BE,BR,BE,CA,HR,CY,CZ,DK,FI,FR,GE,DE,GI,HU,IS,IE,KW,LV,IE,LI,LT,LU,MT,MX,MD,ME,NL,NZ,NO,PY,PE,PL,PT,RO,SA,RS,SK,SI,ES,SE,CH,TR,UAE,UK,US,UY", currency = "EUR,AUD,BRL,CAD,CZK,DKK,GEL,GIP,HUF,ISK,KWD,CHF,MXN,MDL,NZD,NOK,PYG,PEN,PLN,RON,SAR,RSD,SEK,TRY,AED,GBP,USD,UYU" }
-seven_eleven = { country = "JP", currency = "JPY" }
-lawson = { country = "JP", currency = "JPY" }
-mini_stop = { country = "JP", currency = "JPY" }
-family_mart = { country = "JP", currency = "JPY" }
-seicomart = { country = "JP", currency = "JPY" }
-pay_easy = { country = "JP", currency = "JPY" }
+blik = {country = "PL", currency = "PLN"}
+trustly = {country = "ES,UK,SE,NO,AT,NL,DE,DK,FI,EE,LT,LV", currency = "CZK,DKK,EUR,GBP,NOK,SEK"}
+online_banking_czech_republic = {country = "CZ", currency = "EUR,CZK"}
+online_banking_finland = {country = "FI", currency = "EUR"}
+online_banking_poland = {country = "PL", currency = "PLN"}
+online_banking_slovakia = {country = "SK", currency = "EUR,CZK"}
+bancontact_card = {country = "BE", currency = "EUR"}
+ach = {country = "US", currency = "USD"}
+bacs = {country = "UK", currency = "GBP"}
+sepa = {country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT", currency = "EUR"}
+ali_pay_hk = {country = "HK", currency = "HKD"}
+bizum = {country = "ES", currency = "EUR"}
+go_pay = {country = "ID", currency = "IDR"}
+kakao_pay = {country = "KR", currency = "KRW"}
+momo = {country = "VN", currency = "VND"}
+gcash = {country = "PH", currency = "PHP"}
+online_banking_fpx = {country = "MY", currency = "MYR"}
+online_banking_thailand = {country = "TH", currency = "THB"}
+touch_n_go = {country = "MY", currency = "MYR"}
+atome = {country = "MY,SG", currency = "MYR,SGD"}
+swish = {country = "SE", currency = "SEK"}
+permata_bank_transfer = {country = "ID", currency = "IDR"}
+bca_bank_transfer = {country = "ID", currency = "IDR"}
+bni_va = {country = "ID", currency = "IDR"}
+bri_va = {country = "ID", currency = "IDR"}
+cimb_va = {country = "ID", currency = "IDR"}
+danamon_va = {country = "ID", currency = "IDR"}
+mandiri_va = {country = "ID", currency = "IDR"}
+alfamart = {country = "ID", currency = "IDR"}
+indomaret = {country = "ID", currency = "IDR"}
+open_banking_uk = {country = "GB", currency = "GBP"}
+oxxo = {country = "MX", currency = "MXN"}
+pay_safe_card = {country = "AT,AU,BE,BR,BE,CA,HR,CY,CZ,DK,FI,FR,GE,DE,GI,HU,IS,IE,KW,LV,IE,LI,LT,LU,MT,MX,MD,ME,NL,NZ,NO,PY,PE,PL,PT,RO,SA,RS,SK,SI,ES,SE,CH,TR,UAE,UK,US,UY", currency = "EUR,AUD,BRL,CAD,CZK,DKK,GEL,GIP,HUF,ISK,KWD,CHF,MXN,MDL,NZD,NOK,PYG,PEN,PLN,RON,SAR,RSD,SEK,TRY,AED,GBP,USD,UYU"}
+seven_eleven = {country = "JP", currency = "JPY"}
+lawson = {country = "JP", currency = "JPY"}
+mini_stop = {country = "JP", currency = "JPY"}
+family_mart = {country = "JP", currency = "JPY"}
+seicomart = {country = "JP", currency = "JPY"}
+pay_easy = {country = "JP", currency = "JPY"}
 
 [pm_filters.braintree]
 paypal = { currency = "AUD,BRL,CAD,CNY,CZK,DKK,EUR,HKD,HUF,ILS,JPY,MYR,MXN,TWD,NZD,NOK,PHP,PLN,GBP,RUB,SGD,SEK,CHF,THB,USD" }
@@ -398,17 +398,17 @@ debit = { currency = "USD" }
 stripe = { long_lived_token = false, payment_method = "wallet", payment_method_type = { type = "disable_only", list = "google_pay" } }
 checkout = { long_lived_token = false, payment_method = "wallet" }
 stax = { long_lived_token = true, payment_method = "card,bank_debit" }
-mollie = { long_lived_token = false, payment_method = "card" }
-square = { long_lived_token = false, payment_method = "card" }
+mollie = {long_lived_token = false, payment_method = "card"}
+square = {long_lived_token = false, payment_method = "card"}
 braintree = { long_lived_token = false, payment_method = "card" }
-payme = { long_lived_token = false, payment_method = "card" }
-gocardless = { long_lived_token = true, payment_method = "bank_debit" }
+payme = {long_lived_token = false, payment_method = "card"}
+gocardless = {long_lived_token = true, payment_method = "bank_debit"}
 
 [temp_locker_enable_config]
-stripe = { payment_method = "bank_transfer" }
-nuvei = { payment_method = "card" }
-shift4 = { payment_method = "card" }
-bluesnap = { payment_method = "card" }
+stripe = {payment_method = "bank_transfer"}
+nuvei = {payment_method = "card"}
+shift4 = {payment_method = "card"}
+bluesnap = {payment_method = "card"}
 
 [connector_customer]
 connector_list = "gocardless,stax,stripe"
@@ -447,9 +447,9 @@ wallet.apple_pay = { connector_list = "stripe,adyen" }
 wallet.paypal = { connector_list = "adyen" }
 card.credit = { connector_list = "stripe,adyen,authorizedotnet,globalpay,worldpay,multisafepay,nmi,nexinets,noon" }
 card.debit = { connector_list = "stripe,adyen,authorizedotnet,globalpay,worldpay,multisafepay,nmi,nexinets,noon" }
-bank_debit.ach = { connector_list = "gocardless" }
-bank_debit.becs = { connector_list = "gocardless" }
-bank_debit.sepa = { connector_list = "gocardless" }
+bank_debit.ach = { connector_list = "gocardless"}
+bank_debit.becs = { connector_list = "gocardless"}
+bank_debit.sepa = { connector_list = "gocardless"}
 
 [connector_request_reference_id_config]
 merchant_ids_send_payment_id_as_connector_request_id = []
@@ -474,7 +474,7 @@ redis_expiry = 900
 pm_auth_key = "Some_pm_auth_key"
 
 [lock_settings]
-redis_lock_expiry_seconds = 180             # 3 * 60 seconds
+redis_lock_expiry_seconds = 180 # 3 * 60 seconds
 delay_between_retries_in_milliseconds = 500
 
 [kv_config]
diff --git a/config/docker_compose.toml b/config/docker_compose.toml
index 4d50600e1bf8..a46c9594bf55 100644
--- a/config/docker_compose.toml
+++ b/config/docker_compose.toml
@@ -329,6 +329,10 @@ payout_connector_list = "wise"
 [multiple_api_version_supported_connectors]
 supported_connectors = "braintree"
 
+[payment_method_auth]
+redis_expiry = 900
+pm_auth_key = "Some_pm_auth_key"
+
 [lock_settings]
 redis_lock_expiry_seconds = 180 # 3 * 60 seconds
 delay_between_retries_in_milliseconds = 500