diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
index 1164e87e9f..623e39dc7f 100644
--- a/modules/react-native-status/android/build.gradle
+++ b/modules/react-native-status/android/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation 'com.github.ericwlange:AndroidJSCore:3.0.1'
     implementation 'status-im:function:0.0.1'
 
-    String statusGoVersion = 'develop-g6c469299'
+    String statusGoVersion = 'develop-g93811388'
     final String statusGoGroup = 'status-im', statusGoName = 'status-go'
 
     // Check if the local status-go jar exists, and compile against that if it does
diff --git a/modules/react-native-status/ios/RCTStatus/pom.xml b/modules/react-native-status/ios/RCTStatus/pom.xml
index 5459a7c9d9..0ef5f91444 100644
--- a/modules/react-native-status/ios/RCTStatus/pom.xml
+++ b/modules/react-native-status/ios/RCTStatus/pom.xml
@@ -25,7 +25,7 @@
                         <artifactItem>
                             <groupId>status-im</groupId>
                             <artifactId>status-go-ios-simulator</artifactId>
-                            <version>develop-g6c469299</version>
+                            <version>develop-g93811388</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>./</outputDirectory>
diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs
index 5893612778..8346b75bbc 100644
--- a/src/status_im/constants.cljs
+++ b/src/status_im/constants.cljs
@@ -38,7 +38,8 @@
   {:wallet {:visible-tokens {:testnet #{:STT :ATT}
                              :mainnet #{:SNT}}}
    :wnode {:testnet "main"
-           :mainnet "main"}})
+           :mainnet "main"
+           :rinkeby "main"}})
 
 (defn- transform-config [networks]
   (->> networks
@@ -88,12 +89,24 @@
           mainnet-networks)))
 
 (def default-wnodes
-  {:testnet {"main"   {:id      "main"
-                       :name    "Status testnet mailserver A"
-                       :address "enode://88329092a4328bec2bf5422063a87e50637992d3d7e2e2937371ad6db36e268c4fe7ce4e1f45c71e462339d051505a65b9ac13b86c5788d5bee7f481c01ba58b@159.65.125.20:30504"}}
+  {:testnet {"main" {:id      "main"
+                     :name    "Status mailserver A"
+                     :address "enode://1da276e34126e93babf24ec88aac1a7602b4cbb2e11b0961d0ab5e989ca9c261aa7f7c1c85f15550a5f1e5a5ca2305b53b9280cf5894d5ecf7d257b173136d40@167.99.209.61:30504"}
+             "backup" {:id      "backup"
+                       :name    "Status mailserver B"
+                       :address "enode://07ac64fe0e9b2d4ecbfe0ccaeab3d8d95fa8858754f511104bb403b19255d7bf47a8416bdd0df01f6720ff82164451b7a028c93d15ddd37b7e8382d74e91ebc2@167.99.209.72:30504"}}
    :mainnet {"main" {:id      "main"
-                     :name    "Status mainnet mailserver"
-                     :address "enode://b17980946f8ae5415bd43930582a1ba792ac03a3654a9a5348263d80b5b5bc9206ec057dd603e9be87c2599e5ca23532d070969bcb1a3f985b318cc2e8290449@46.101.250.197:30504"}}})
+                     :name    "Status mailserver A"
+                     :address "enode://1da276e34126e93babf24ec88aac1a7602b4cbb2e11b0961d0ab5e989ca9c261aa7f7c1c85f15550a5f1e5a5ca2305b53b9280cf5894d5ecf7d257b173136d40@167.99.209.61:30504"}
+             "backup" {:id      "backup"
+                       :name    "Status mailserver B"
+                       :address "enode://07ac64fe0e9b2d4ecbfe0ccaeab3d8d95fa8858754f511104bb403b19255d7bf47a8416bdd0df01f6720ff82164451b7a028c93d15ddd37b7e8382d74e91ebc2@167.99.209.72:30504"}}
+   :rinkeby {"main" {:id     "main"
+                     :name   "Status mailserver A"
+                     :address "enode://43829580446ad138386dadb7fa50b6bd4d99f7c28659a0bc08115f8c0380005922a340962496f6af756a42b94a1522baa38a694fa27de59c3a73d4e08d5dbb31@206.189.6.48:30504"}
+             "backup" {:id      "backup"
+                       :name    "Status mailserver B"
+                       :address "enode://70a2004e78399075f566033c42e9a0b1d43c683d4742755bb5457d03191be66a1b48c2b4fb259696839f28646a5828a1958b900860e27897f984ad0fc8482404@206.189.56.154:30504"}}})
 
 (def currencies
   {:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"}