diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim
index 6f70f8b2d8..532e5bbc43 100644
--- a/src/app_service/common/network_constants.nim
+++ b/src/app_service/common/network_constants.nim
@@ -145,7 +145,8 @@ var NODE_CONFIG* = %* {
     "Enabled": true
   },
   "ClusterConfig": {
-    "Enabled": true
+    "Enabled": true,
+    "ClusterID": 16
   },
   "DataDir": "./ethereum/mainnet",
   "EnableNTPSync": true,
@@ -221,6 +222,7 @@ var NODE_CONFIG* = %* {
     "AutoUpdate": true,
     "Rendezvous": true,
     "EnableFilterFullNode": true,
+    "UseShardAsDefaultTopic": true,
   },
   "WalletConfig": {
     "Enabled": true,
diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim
index a5667dacf5..9b07ec3e0a 100644
--- a/src/app_service/service/accounts/service.nim
+++ b/src/app_service/service/accounts/service.nim
@@ -314,8 +314,8 @@ QtObject:
         return self.prepareAccountSettingsJsonObject(self.importedAccount, installationId, displayName)
 
   proc getDefaultNodeConfig*(self: Service, installationId: string, recoverAccount: bool): JsonNode =
-    let fleet = Fleet.StatusProd
-    let dnsDiscoveryURL = "enrtree://AL65EKLJAUXKKPG43HVTML5EFFWEZ7L4LOKTLZCLJASG4DSESQZEC@prod.status.nodes.status.im"
+    let fleet = Fleet.ShardsTest
+    let dnsDiscoveryURL = "enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im"
 
     result = NODE_CONFIG.copy()
     result["ClusterConfig"]["Fleet"] = newJString($fleet)
diff --git a/src/app_service/service/settings/service.nim b/src/app_service/service/settings/service.nim
index 5794559655..bb3ec7bb76 100644
--- a/src/app_service/service/settings/service.nim
+++ b/src/app_service/service/settings/service.nim
@@ -18,7 +18,7 @@ export stickers_dto
 # Default values:
 const DEFAULT_CURRENCY* = "USD"
 const DEFAULT_TELEMETRY_SERVER_URL* = "https://telemetry.status.im"
-const DEFAULT_FLEET* = $Fleet.StatusProd
+const DEFAULT_FLEET* = $Fleet.ShardsTest
 
 # Signals:
 const SIGNAL_CURRENCY_UPDATED* = "currencyUpdated"