diff --git a/core/src/main/res/raw/ca_prod.crt b/core/src/main/res/raw/ca_prod.crt
old mode 100755
new mode 100644
index e109c8eea0..9b2a56d309
--- a/core/src/main/res/raw/ca_prod.crt
+++ b/core/src/main/res/raw/ca_prod.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgIJAIcQsWLREJkoMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV
-BAYTAkRFMQowCAYDVQQIDAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFi
-YmxlIEdtYkgxEzARBgNVBAMMCnNuYWJibGUuaW8wHhcNMTgxMTE0MTcwMjQ0WhcN
-MjIxMTEzMTcwMjQ0WjBUMQswCQYDVQQGEwJERTEKMAgGA1UECAwBPjENMAsGA1UE
-BwwEQm9ubjEVMBMGA1UECgwMc25hYmJsZSBHbWJIMRMwEQYDVQQDDApzbmFiYmxl
-LmlvMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA55DpiJMQHAC7OmsH
-6V+6HmIJ5z+e73n/DOXS8G4neE5Ynya2++WqMHUmh29r7yGJFiOmxeUoFInKBN8I
-ErGYRW8NAJM7X77LVaKk+kBe3hNxkXfqLhPM6ZtMRs0NXerX25rIEJV3oBby3oZP
-3d2CrW/JYQU7crIwmoQAJYTcKISllK+9sBoXNE6EtT24AHSvnsSc7IGfRXGWHFXH
-ovoHNJbWVXOs9t4BFbtD/LE270Yb3+pLu3XMzYzEPhkICXsvgVVsoBn4ZoNWBGHO
-97ZTdaf72MHRjLDQJFaQL1zBuOtkfPHk0U9H8cQRU8ii33209Sh1Os8XGU4VldxA
-QxZousDAAXCQ9NLb5a4GxkwkTL+cSMAsxFZGhLT9DJC2QFzjW3KRQwH59g9H5TUW
-Yd7DtegVH507g7qrWsOiN585T5o9oprMX1FR2KYzhMrdpL/AoEuk09+7vwfXuncX
-Wy+kNTOXcUF3Qj2p3beLCuaG7H8QEIGw9HqEHCHY1k+mxEbh32bnYZXN5K2jcOXL
-HqHmNNRa5i31UhMSCsH51osoff06l8vlqRuuWIS4PnA/ZZHaezsFtBAiH7xpzKq5
-7crhKYb9W+76eTN1L1kPedb0i5oNdLw2NWD3oyCFDs81uKU/qxgRdnJN3bFcDij9
-mT6IHnQmN+CyjOlGofESTZzJ23MCAwEAAaNTMFEwHQYDVR0OBBYEFDNocVYueOab
-gtzbx5+BM1cAIiltMB8GA1UdIwQYMBaAFDNocVYueOabgtzbx5+BM1cAIiltMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIJ9XIxP9l5X7+B3H45r
-bmX0gVWFa2PjlRJ2p47mBq29wg9wpbB5gGwC92p6pRapv5rX4fA0pV44mHM1P1LF
-GbXxMeivpAX/rp0Gb+qBdvPSCZ18IGH8vyrneQKD1ICyzTa8VPgHSIDLxuzHPLFf
-kbxbKv1ANbYzLt8+BBeELCJ0siUxY0eJys0QxdTLJ2hv54DNciYM/IKoCHWE1qne
-4KgqCIJTFjH7aq2B2darAv3fSrxlwGffYkqbQowZDJ5itid/b/YGwShXSTRQnF8D
-6oLaGff4TF7oSqam1fWnqFsbvi4kZ0LgYhpLBOQK/cd5hiTpNuWbChJd5VZYNrP/
-7mVh0bn1sM+tYivgnuMbFvM8UeCyP/fe1RQ5mjXXA9DK8+7T+GcERWHaGIgzyxWc
-8tGU22YVZungI1RCgi9u8EllwMzEEkSBvnQ8dDGjJV+BJ/ohTEumtYTD4Wt0+Vrs
-01YCu6qns55qziJd/zEYJNKFBDhDwCZYj5s/uFyR1BCpm3Qf7EyzE9ha0ysqkfBQ
-N1bNIlhKYNsovfWm2ImZNvSJatWtkXpKN1YQefYRvJhEHVTuqisItmH3pOuPwY1w
-XJd56aiZaEdLcAgbA+YOURaWcFhfiPx5AKEvdVy6z1vPEHVcikrwxwwuDNbyvugu
-njiV88Zu9PWCCWInLOn9MD6v
+MIIFiTCCA3GgAwIBAgIUfF0PMvCwKsfqZrf1m4uNKNo2IBkwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCREUxCjAIBgNVBAgMAT4xDTALBgNVBAcMBEJvbm4xFTAT
+BgNVBAoMDHNuYWJibGUgR21iSDETMBEGA1UEAwwKc25hYmJsZS5pbzAeFw0yMjEx
+MTYwODU0MDdaFw0yNjExMTUwODU0MDdaMFQxCzAJBgNVBAYTAkRFMQowCAYDVQQI
+DAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFiYmxlIEdtYkgxEzARBgNV
+BAMMCnNuYWJibGUuaW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDn
+kOmIkxAcALs6awfpX7oeYgnnP57vef8M5dLwbid4TlifJrb75aowdSaHb2vvIYkW
+I6bF5SgUicoE3wgSsZhFbw0AkztfvstVoqT6QF7eE3GRd+ouE8zpm0xGzQ1d6tfb
+msgQlXegFvLehk/d3YKtb8lhBTtysjCahAAlhNwohKWUr72wGhc0ToS1PbgAdK+e
+xJzsgZ9FcZYcVcei+gc0ltZVc6z23gEVu0P8sTbvRhvf6ku7dczNjMQ+GQgJey+B
+VWygGfhmg1YEYc73tlN1p/vYwdGMsNAkVpAvXMG462R88eTRT0fxxBFTyKLffbT1
+KHU6zxcZThWV3EBDFmi6wMABcJD00tvlrgbGTCRMv5xIwCzEVkaEtP0MkLZAXONb
+cpFDAfn2D0flNRZh3sO16BUfnTuDuqtaw6I3nzlPmj2imsxfUVHYpjOEyt2kv8Cg
+S6TT37u/B9e6dxdbL6Q1M5dxQXdCPandt4sK5obsfxAQgbD0eoQcIdjWT6bERuHf
+Zudhlc3kraNw5cseoeY01FrmLfVSExIKwfnWiyh9/TqXy+WpG65YhLg+cD9lkdp7
+OwW0ECIfvGnMqrntyuEphv1b7vp5M3UvWQ951vSLmg10vDY1YPejIIUOzzW4pT+r
+GBF2ck3dsVwOKP2ZPogedCY34LKM6Uah8RJNnMnbcwIDAQABo1MwUTAdBgNVHQ4E
+FgQUM2hxVi545puC3NvHn4EzVwAiKW0wHwYDVR0jBBgwFoAUM2hxVi545puC3NvH
+n4EzVwAiKW0wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAsWye
+HhF5/guxZkP7mUadWrAmJlasWK+CWLS7V84dWQnSNtg1KVTYdJQ7dewZaQiUN4sJ
+3i0jdmDAjldrivXbovVrCEn6mmya++8r8Dk9WcQQ0UgiyO0ycl9aLqilapLK7xY1
+aeNSITHwR8cVrn838hWoCd1sxFtTYNCydFze1B2cNLvu17t4PIA0NMjjFftYvqKC
+XU+JomxAEkyAyd0Fw0/f09oFcuO8bTX5ez+j+cH6D1qaB7Yn937VWRfdIwPL2lCT
+60jZc4MNd7pYz90UmIM5vZSUXlfCItN9An1N0Rj4AZKFmY8eQnKPaeFWvXZMEWv4
+ka+9gHIgSbh9dYnGlUTZXSQwLtdSTon7IjbFPpK7XxoLEKOX668CCnEbm47UKVf8
+Wyhs1Ky5ayMFtMDWhPMbsOoikXEkOtnosPIN+gN/RmW+mvrpP9plNxscwBRs+uOb
+bNj5r8j1aReH+I/EdloP8YPz82lQ/YKYFa4qlXgHjLupmPXl+iG4LVIBIV11xAEH
+slF4ZlxboSIc9Kgzdbdn8zyXAv4739BqTwcylYF+3Sn2svXeevl7VbHqhY255Jum
+INUlHVs6n6klK7WcTpppvsWLUNjvmfTJ2G/6MFDk3U7Q1T8wdaJ4DB07lO1WTo5W
++4ny40klGxK5vwMhhJ4qy7hMY9WkIBkRFcVUze0=
 -----END CERTIFICATE-----
diff --git a/core/src/main/res/raw/ca_staging.crt b/core/src/main/res/raw/ca_staging.crt
old mode 100755
new mode 100644
index 88570a1a74..3731aeb21c
--- a/core/src/main/res/raw/ca_staging.crt
+++ b/core/src/main/res/raw/ca_staging.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgIJAPC1veVJx1shMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV
-BAYTAkRFMQowCAYDVQQIDAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFi
-YmxlIEdtYkgxEzARBgNVBAMMCnNuYWJibGUuaW8wHhcNMTgxMTE0MTcwMjAwWhcN
-MjIxMTEzMTcwMjAwWjBUMQswCQYDVQQGEwJERTEKMAgGA1UECAwBPjENMAsGA1UE
-BwwEQm9ubjEVMBMGA1UECgwMc25hYmJsZSBHbWJIMRMwEQYDVQQDDApzbmFiYmxl
-LmlvMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvOCU+3U47yu8/Icd
-Lypl/53Asuc6JNUZrOe4nGsviO06cSZbleFr8uxXPuqiXatPc91v9SadkVCmOnWr
-X+sWHISPVg5MjRuXaCzuI6p8SuiYXbbYeNDeFzKHkGnlbLB9nwdsxLozIFmnbiN0
-UVNeIi0SmHRYwDAHpDj6Iem+VX6FZHbl+pkIr6z1tu1zUakHgN9BydKz/LepVS5C
-+1fj2STA7qsadimdNAopOGwe4PS0BwUYXknb7OKlb4e7GXDv9AMWUK4naqIhPwqy
-I01G7z/UERrFlYZ1A1FLhbIfuqdh5LvzwKCU2SlRUQYzpi7hFsVhcEEjdvtzkrBP
-/v4mYMN9m3iZpfsJnu7x+8iAzrkDqDRzQPYPs/supCm5Xmc1tdQqqHDshclBImDO
-GCfJHIl+ITsaCK761B3gZ1Wp2meKFim9OtgE5MrX/KeTOXTWH91Rm9JCmvmb7ZJ7
-DF0DlYVs6Y2B4JclmyrgLRxHtIahdllPh0V6DNcjfu6regHYbAjnbTbJTmvudglR
-kam3S8ykVBDcjr/CL/r2oYf3PqTECrjYijoffVHjQv3uTG74xsJauKrbTtgJwvrX
-21hAdn6UUKK+ZlfzwwT8SPuutJN6dpSI/ztdSOx+TFT/9Ye6WW1tyimphUz5gs07
-KDr7v8aKHJC61ltcUlCb/w92R9sCAwEAAaNTMFEwHQYDVR0OBBYEFJQQJCUh+RXa
-xKBFOcY6w+OuQNEbMB8GA1UdIwQYMBaAFJQQJCUh+RXaxKBFOcY6w+OuQNEbMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAF03G6lPt6LtSrhHN+ZI
-NnSRxG/KwSc/E85FP6KCiMkK2Fahc7U4NU+DOSq9yoU1yXjKMd75ik+2STeAodBD
-r8ZS/lz1W8Hdw65Lnfik2L64rLcyoohUqShyyA+ZHSWIhU7uyxY0W9lTxDj23fHe
-dljiTxIh0YNmV9Jp5LB5p789wUwA0XQaKHugz81uqv8s7nSgJFUWZM3bCPEonI1r
-EL8Taf8NuZKnUD8du5LnmDYO3Hc1O0iT3km+jXeBaM0PXxtxXEG2RHv2NZaCYWHz
-sH/FcpcR/rVjygi2gdYZcT59lXljJuGiVBpEwCLffHXMNm7k4+iBR3aP3aA4SpLT
-bXWk+FKxr+TV64f0fiua/VXplT2AdxuFEPhwirOob3UbYS/jArfG6DcLxsysLNw8
-oRSJT79wg3KPdU5MuSxl61dab+bgipoa90WVOS+Atl23Uw/aYrfyWg5Ab0uowjVt
-JHkqhDR2rpljpzEDCZk3Ojj7X6SrxL+y90pY1uPvbl1M0oW50yv2AoUIPwwWapV9
-drjKYkoyLt8i+RnXK9X0UhP3iMPSThRMiZNqRzSzm7TknS0Bbk0ytTCJSDxhBrGC
-9vRclXVl6DQMQ/OHzA+GuXHKL8gD5z4FrH3H+2xOP03yYLUob0eDdUnsOOpn8Yc8
-BM4+CL21W0f/Hv1viAJoJh1H
+MIIFiTCCA3GgAwIBAgIUNpH5Ug04foVX/tRGytkqB7h1Cx4wDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCREUxCjAIBgNVBAgMAT4xDTALBgNVBAcMBEJvbm4xFTAT
+BgNVBAoMDHNuYWJibGUgR21iSDETMBEGA1UEAwwKc25hYmJsZS5pbzAeFw0yMjEx
+MTYwODU0MDBaFw0yNjExMTUwODU0MDBaMFQxCzAJBgNVBAYTAkRFMQowCAYDVQQI
+DAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFiYmxlIEdtYkgxEzARBgNV
+BAMMCnNuYWJibGUuaW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8
+4JT7dTjvK7z8hx0vKmX/ncCy5zok1Rms57icay+I7TpxJluV4Wvy7Fc+6qJdq09z
+3W/1Jp2RUKY6datf6xYchI9WDkyNG5doLO4jqnxK6Jhdtth40N4XMoeQaeVssH2f
+B2zEujMgWaduI3RRU14iLRKYdFjAMAekOPoh6b5VfoVkduX6mQivrPW27XNRqQeA
+30HJ0rP8t6lVLkL7V+PZJMDuqxp2KZ00Cik4bB7g9LQHBRheSdvs4qVvh7sZcO/0
+AxZQridqoiE/CrIjTUbvP9QRGsWVhnUDUUuFsh+6p2Hku/PAoJTZKVFRBjOmLuEW
+xWFwQSN2+3OSsE/+/iZgw32beJml+wme7vH7yIDOuQOoNHNA9g+z+y6kKbleZzW1
+1CqocOyFyUEiYM4YJ8kciX4hOxoIrvrUHeBnVanaZ4oWKb062ATkytf8p5M5dNYf
+3VGb0kKa+ZvtknsMXQOVhWzpjYHglyWbKuAtHEe0hqF2WU+HRXoM1yN+7qt6Adhs
+COdtNslOa+52CVGRqbdLzKRUENyOv8Iv+vahh/c+pMQKuNiKOh99UeNC/e5MbvjG
+wlq4qttO2AnC+tfbWEB2fpRQor5mV/PDBPxI+660k3p2lIj/O11I7H5MVP/1h7pZ
+bW3KKamFTPmCzTsoOvu/xoockLrWW1xSUJv/D3ZH2wIDAQABo1MwUTAdBgNVHQ4E
+FgQUlBAkJSH5FdrEoEU5xjrD465A0RswHwYDVR0jBBgwFoAUlBAkJSH5FdrEoEU5
+xjrD465A0RswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAuj3r
+qBvdcDZ42wRoLaQsLxNBFAiOX6MTnLInUJOD3tNfp81lngkwB6TuelGOKquyxiRN
+ZCfnfBret7mb8RAs3J2uPNCrL0V0+igOjrFV/RQM/VrsD4zF1fyversgzzVVi7gY
+qBP1kq9Hk0tG7c/svwUTV5Za7vbfAOTgdMpnJtOtlOfMKlG5D9/au3w0YSc7KvA8
+OrRt6OQN77VtZ42ZSiEptFNKsQAD5Iikh82UTxX7c0lhAwNOuNEoFyoJA9x3Ce+c
+UySUGYM6tVDZ31e8ZOyAGvO/bZAWq9yC97IzTvAKXEGOr+RKNn/82tpX8HkR7ndQ
+xgHEKqfGk6HcomWsEuQbrvIq9P9mcWuRKbJPL5F53bXuW2W/Dm7DNDDoy1pDydQk
+oYf1gDXLCa37IBAXFOK9KgJfc4rSHzLqBJrood1gQcd5C5wZ/vcooxo55g3kVMvo
+Gpbe1NKBQrNhfFp8U3dWz9BWlHM1Mj2eMvY4SwREfFBSK5lkwLk9gS4PXoJvf7r+
+5/Jpj4XxJi08gcy/GN1XySwkUptruKJzjLkmRVIn3gF1WYzA2VcZ7f6FsZmU81vh
+nUmounjYQSW3Y/YrGsFNmm7k1oFX1oj0HCjEWCA+VYrl1jiD258Dro4CSIZKkz3C
+abHtzj6QJBpLVcAaA/bbqd5AFSo1sMpdzt0jUJA=
 -----END CERTIFICATE-----
diff --git a/core/src/main/res/raw/ca_testing.crt b/core/src/main/res/raw/ca_testing.crt
old mode 100755
new mode 100644
index bb2e3d9b0c..5818cd2b86
--- a/core/src/main/res/raw/ca_testing.crt
+++ b/core/src/main/res/raw/ca_testing.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFfjCCA2agAwIBAgIJAMS6vOZsRqdFMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV
-BAYTAkRFMQowCAYDVQQIDAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFi
-YmxlIEdtYkgxEzARBgNVBAMMCnNuYWJibGUuaW8wHhcNMTgxMTE0MTY1NjA0WhcN
-MjIxMTEzMTY1NjA0WjBUMQswCQYDVQQGEwJERTEKMAgGA1UECAwBPjENMAsGA1UE
-BwwEQm9ubjEVMBMGA1UECgwMc25hYmJsZSBHbWJIMRMwEQYDVQQDDApzbmFiYmxl
-LmlvMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxKQoDBXhYNgvN6Ot
-zUK57xp7OigM+Pd+4XbCD80cYgHR/ps/V2IiwviIfl4AfUdo02EweFFVmSdIxUTT
-WqCEr0A+Z1VgLaIM+yOi8LegOYuXwlEliQvYZ5nQPf0vureGIejCpaiZWS/ZQX5B
-thJRUkumRP9jFNGYiZawtHVjwuLA6yevbKY8+p5uY9NsViOwwgpTpSU9JF4idM2+
-xPbTfloteVb/t1LxSVFzvL3Vfv/bvTR0xJvs/qVUydcykF6lL4Z3uC2rGgTqyZyJ
-itTNQDRr0jJFhLfjwiG8S/oYHDAGGKorJhBqw1LtXaxYlc9mH+JgByL5tS2cVZrd
-l3os39W9T9HimycRuDCW1PVQjkUw1kwbOkfDHTuMreaw/ZDUJ1HsH1wxGZbu2Ouj
-ntV0rM84NNvNBnWJJiHgP4rilgLARtmRCid9tlR43GQKAW5XcAK3wFlKJd3lq7Xo
-eqv4PVK0doIonFzbI9+zoTKuRHRP4cqOXUQtHJzAazpgVA7pkbYNh4DFGsqUG4yC
-nqJXPgIXzmMyh2YrMV9cMzHFXjxCzV5eLkm0IaOXs4x8yahiKTard4YJrjJd4qWg
-VjXHZjfdWhswiutEGsdbq5Ke1j5lmoba4fMysXdLUGlqiUQX8+Kn+upanQzGw4J6
-m7Gwr2NV3xjmqXb38PcPb3pc3k0CAwEAAaNTMFEwHQYDVR0OBBYEFJsplTaLe7MH
-3ybMpOfOP85wTo8hMB8GA1UdIwQYMBaAFJsplTaLe7MH3ybMpOfOP85wTo8hMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAAFPZCUZ7FkvHV1ErChK
-SIztLKKn0bF00ywaV3ZZ77FzQuUJMElDYCqIAvDZ6g/vkbGdf9D58uVouKzS1boT
-tqWcd6gd9AkwHrtK/UymDl9Vn4QNwJfyZEWj/hou8L3PqObmn7HCXysgEyhaGUaj
-3LzlQ/TLJdbZEDJWDrhe/96CfPxvJbWIqXOw9kLjF5Y50uk67C5zCp/rZzQsDF0G
-nlS5BIrPnk1KLe3HBi/uvsN1XJRmq3/H7v3178vswOh38qKkAPRl9rqlduQ8XKuG
-KnASmtRZPbbZxUA45Z2mzWiIUNDJIi0UgnB6KwllTlC+79o8NhU+lC7AVNXaN3rZ
-8Dy1yUGaLEwRh3TwBMFEbYsknsWahP+FtNlf+14MOFtbxVUGTaT+HX4+KQ0lh5j0
-pWWMv2aUzIEezTx9u1C7n8bgr6dTc6SSKqmwmcewlIAs/F+B/UYT+omGyrplUgcS
-sQDuYla+dDLIgapc1QuVLCvrXdbOrRyWM04G1kcsdUXuGcc28XxsvOr1N4eRTScG
-tzu3Dw05b9noG2qhAxf7g1AJpvMhQRcOMyaCASxjIjTnWi+bRPSlg4qJqwr95+z5
-woMJ1RRWh60/9ceoq8F97wnfMduWT0UC43WtAg7majkCN6V3WTxSLBBQUSot3OCI
-6KyJ3gxdn8bBdE7nRv/fv2Q+
+MIIFiTCCA3GgAwIBAgIUQyT4c+L7LfZCMd9LJzBX1zlWEdcwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCREUxCjAIBgNVBAgMAT4xDTALBgNVBAcMBEJvbm4xFTAT
+BgNVBAoMDHNuYWJibGUgR21iSDETMBEGA1UEAwwKc25hYmJsZS5pbzAeFw0yMjEx
+MTYwODM1MzhaFw0yNjExMTUwODM1MzhaMFQxCzAJBgNVBAYTAkRFMQowCAYDVQQI
+DAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFiYmxlIEdtYkgxEzARBgNV
+BAMMCnNuYWJibGUuaW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE
+pCgMFeFg2C83o63NQrnvGns6KAz4937hdsIPzRxiAdH+mz9XYiLC+Ih+XgB9R2jT
+YTB4UVWZJ0jFRNNaoISvQD5nVWAtogz7I6Lwt6A5i5fCUSWJC9hnmdA9/S+6t4Yh
+6MKlqJlZL9lBfkG2ElFSS6ZE/2MU0ZiJlrC0dWPC4sDrJ69spjz6nm5j02xWI7DC
+ClOlJT0kXiJ0zb7E9tN+Wi15Vv+3UvFJUXO8vdV+/9u9NHTEm+z+pVTJ1zKQXqUv
+hne4LasaBOrJnImK1M1ANGvSMkWEt+PCIbxL+hgcMAYYqismEGrDUu1drFiVz2Yf
+4mAHIvm1LZxVmt2Xeizf1b1P0eKbJxG4MJbU9VCORTDWTBs6R8MdO4yt5rD9kNQn
+UewfXDEZlu7Y66Oe1XSszzg0280GdYkmIeA/iuKWAsBG2ZEKJ322VHjcZAoBbldw
+ArfAWUol3eWrteh6q/g9UrR2giicXNsj37OhMq5EdE/hyo5dRC0cnMBrOmBUDumR
+tg2HgMUaypQbjIKeolc+AhfOYzKHZisxX1wzMcVePELNXl4uSbQho5ezjHzJqGIp
+Nqt3hgmuMl3ipaBWNcdmN91aGzCK60Qax1urkp7WPmWahtrh8zKxd0tQaWqJRBfz
+4qf66lqdDMbDgnqbsbCvY1XfGOapdvfw9w9velzeTQIDAQABo1MwUTAdBgNVHQ4E
+FgQUmymVNot7swffJsyk584/znBOjyEwHwYDVR0jBBgwFoAUmymVNot7swffJsyk
+584/znBOjyEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEArA7R
+7twId7iEUHdHXVd5zmqYjsCUQ8b/EH4ztORwe1pWPGIWHa8qeUB6R/+mVBvtng7L
+I1/Xo7dVoLQYQJtpvx+WcjPbdF2kfmAY6SEHfvIHvNjnYUn8WVf0Z/sQUgoCy/zb
+D242yTkE8WHgduG0e7uaO6YTaIcQlLInEN4vsp+mrEVvRvSbCH1VOnC/J7wsF/0T
+yeXEB8Ev06/kMx4worX4stvWUr01LIsf8wF2ST6mjjgCT7ISbUyIBAp2GEv4O+vZ
+2qpYbu43ErwueN6qCxnq8En3S/VPzmT+JN2mEeNr/AEAKo1TSrMRQ4SkvywLNYhx
+2+Tezow84r41YMUo7dnVtaA1XNlRYpGJ/QggYnIFC0mh55ywb2a4WDsbPZcW2lyW
+5lOH8628yRffRw7sdqtkQcwnA/98BEd7fRA4z6CayC9f6kgTdwOF+2KkveFNzVDV
++1KpsBKRI6Qj3uycZ4NsDM0bP53TwjOjLrPihbt2ECr0CzNq190DFz55vUz5Z5/I
+MV+yrzi27pf4uutwBU1H4/UtI2cJVYY+zKuQWdpnl6XL3YgEUVtnkXzg2/Ioi6W2
+V89hsqWIpX2gCvDuOgYZ8o4Z5by1bDM0g6/BW3tNhsSq16UvXIP/f3l6lFIt2AVA
+VHTXwyxE+j4NmcbJVe7jETzDoodCpDlXRsPIQas=
 -----END CERTIFICATE-----
diff --git a/core/src/test/resources/metadata.json b/core/src/test/resources/metadata.json
index d88294dd99..e5eba41d22 100644
--- a/core/src/test/resources/metadata.json
+++ b/core/src/test/resources/metadata.json
@@ -278,8 +278,8 @@
   ],
   "gatewayCertificates": [
     {
-      "value": "MIIE8TCCAtmgAwIBAgIUa0QeAS/qSnuGRRZuw60oDbRwq9swDQYJKoZIhvcNAQELBQAwVDELMAkGA1UEBhMCREUxCjAIBgNVBAgMAT4xDTALBgNVBAcMBEJvbm4xFTATBgNVBAoMDHNuYWJibGUgR21iSDETMBEGA1UEAwwKc25hYmJsZS5pbzAeFw0yMDExMTUxODA3MDFaFw0yMjExMTUxODA3MDFaMBExDzANBgNVBAMMBmNsaWVudDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMxNZaNeI5/Xls2tdOJKbvNLpXNgM1ZHCPX8n8C3EWbOhp7gKc7UEwCaLiAvKRQkhYx4Ye0Mx/4+5Q9qZmA7rSHYzpCK+LdifqFo4xAftp7dZwf2L/aHggaduGVy3B3Vyw7WfDuxBxpF1jckLTlsyLB+zJxXdJvZLMVcdtjpU/Ahe4pV9boSqxYZulsYcdN6yfgZQesdY1OGanFUvke5ZbAdtejwxTFr0PToXb03+EpbFMDB41kUnusW2NaLCQ0YSnQDP9c6R4dYTCFbP682N5cvdOCDnwCw4v/7xU8ydApUKwOMz9aKoI96hdmu2KtNjPzgo9oBQhCW9rkDAWyvMKSlu71Pd5mE7fTsK0rKu+2lyIaRj93uhNe5leROO0vtLLvUdxIQVKHM5PsaOt67JqxES9HG0r+T4NIZtCU7c2GTZjULLcMg+AeBS+bgp/PpG/qTfY/976iSjurJMHuNG/lMWu/HxGsAyrIqSEYfIzfHx8KgL1OyTlVPWX463PmHgXTCeBLPziCWlolokP0UKAbqXEmm83vsUuMEt0Xqlekrqry0Nmy/0dIUb9HbCkb/Yg3DneHuuN7JPO7Ixz2CuQgfOONb4AVUUV/XARpaN27T+K0VmGeiywlniZh3IcQwdUNru4LvK8mQbkxzvpXi5MFgUAfB3OxhvQTVNUdPGalPAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAAtoeX7ic9PbqTpOsjKagJizTo7Z8ECh/3h02LZSUSX65iJ4vK+09VaZiXf4psAJCy8j2lrwRI4fAZyUikBqGngPvwyCuNkEfxsa+AjnxBGs4TpqTS7mTUIo/urDG7TOy1gy3vUnPPMm9WQReAQtkZDobEhqGucv5fyvHqgDCpkTIFHRG4Pi4XS0iTTrhUhstyLSquyH+N7FDQndo6CHmyL2xf/sgfSZsTeEcU6DgnepZ9XIggZ2KbwKqpbHj7/J71wnFWNaeh8VkwGgdOR8VKvxf5sHlExOhBOWuWJdkLre+8LkBbbJZG/z+LcIrWV33u/FP5iwGg6JJtmfB0PqnLfzvsnGB9BeuENOjjcL1UYSScI3XsTZkmLAdKgQPbqxnPf6VAlqrLYYIMBLuPDDddqm3fhUGpvs4t82eXZt1Wj4xeI4fPxcV2xecIOBlZlIykD2wLyzAIp4YFzcWsmu5ryE3n/3aAj7hHrhpNurPq5Xo2Q+sB/hbAmeeZC9URvXwASFkRnmNfKr+F9nFMEND1gGqriuU1QdOsrk8HOCaVROmpThjVv593Q2sSIprNyf8jk5Sw33vMWtivyNeglrdffnKtuX6KeR/Nza/+lBeN3PJjRF2vrmHDcWKR/+MALfO4WonKsjJRjig7JO+CHsjDp8ymNN+M2Y4/0LY+4C5pVs",
-      "validUntil": "2022-11-15T00:00:00Z"
+      "value": "MIIE7DCCAtQCFGdGHrKz0qHO/gnMT9YdAFHBfiKfMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNVBAYTAkRFMQowCAYDVQQIDAE+MQ0wCwYDVQQHDARCb25uMRUwEwYDVQQKDAxzbmFiYmxlIEdtYkgxEzARBgNVBAMMCnNuYWJibGUuaW8wHhcNMjIxMTE2MDgzNTM5WhcNMjQxMTE1MDgzNTM5WjARMQ8wDQYDVQQDDAZjbGllbnQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMTWWjXiOf15bNrXTiSm7zS6VzYDNWRwj1/J/AtxFmzoae4CnO1BMAmi4gLykUJIWMeGHtDMf+PuUPamZgO60h2M6Qivi3Yn6haOMQH7ae3WcH9i/2h4IGnbhlctwd1csO1nw7sQcaRdY3JC05bMiwfsycV3Sb2SzFXHbY6VPwIXuKVfW6EqsWGbpbGHHTesn4GUHrHWNThmpxVL5HuWWwHbXo8MUxa9D06F29N/hKWxTAweNZFJ7rFtjWiwkNGEp0Az/XOkeHWEwhWz+vNjeXL3Tgg58AsOL/+8VPMnQKVCsDjM/WiqCPeoXZrtirTYz84KPaAUIQlva5AwFsrzCkpbu9T3eZhO307CtKyrvtpciGkY/d7oTXuZXkTjtL7Sy71HcSEFShzOT7GjreuyasREvRxtK/k+DSGbQlO3Nhk2Y1Cy3DIPgHgUvm4Kfz6Rv6k32P/e+oko7qyTB7jRv5TFrvx8RrAMqyKkhGHyM3x8fCoC9Tsk5VT1l+Otz5h4F0wngSz84glpaJaJD9FCgG6lxJpvN77FLjBLdF6pXpK6q8tDZsv9HSFG/R2wpG/2INw53h7rjeyTzuyMc9grkIHzjjW+AFVFFf1wEaWjdu0/itFZhnossJZ4mYdyHEMHVDa7uC7yvJkG5Mc76V4uTBYFAHwdzsYb0E1TVHTxmpTwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQB4c3YJtF+/f2gnJWUCwr0gWuAkcMNnPIRAIBn+t18G2I3bABIy4d41I2yZEfiLOOwTyviqQWous4MpWFRRFI+HM8Kh8Eik4S52/iK+2nPLwNzIdo+se5LEqlxd0IXrnivY95vKPryljBHrNvgMx/NJkTN0bHpVovYUjo8Zt0npKZa5Q1Q1y4kFEgdey4czgOEpzGK9pux1ALU2HU0e/5bJfR/ENoXbCSgV59IRXRPPvFRwyLj/1nYV3a/D8GWfPlFLor25A/y7dGc9f2lwVvkx10b1m1wnoKicdYmVgLgYgJXo43UGWsqznvcbfOjNv7UW+tofUSkWEV0mtRSyt5u/+xjqg7MYAJ1xUZmnaPNbvrCg2+EnCz3hfbhkDvJuxt423nV9rFz9HO79CVd4y1bl85WRWSOfluPuoioXpl2VwOqBXQZMCsbPcyG1P/xukLc9OZUkSS13cMX2EnEJEI4hYLeVoo928gCI/2iDvnarQzy7bh38brsSQ5EcyGuA7mt5WBb5Y4wO8184jDu3UXiERiS6XetVfSMFYyVEnEQ4vT2jwxcTjywVbww74/rfrsdtNgXbJUHD8bDwgReKgDLSoQa7D2wI77kLvt6HX1sbnFw5LKIJpzJMsQUUnq0O2OA8wPowiARUgsakGuWRHwQAee5CrUeEdriTXEw78Ggr6g==",
+      "validUntil": "2024-11-15T08:35:39Z"
     }
   ]
-}
\ No newline at end of file
+}