diff --git a/packages/ui-settings/src/defaults.ts b/packages/ui-settings/src/defaults.ts
index 7d4ace24..0284d3d8 100644
--- a/packages/ui-settings/src/defaults.ts
+++ b/packages/ui-settings/src/defaults.ts
@@ -8,8 +8,21 @@ import { Options } from './types';
 // tslint:disable-next-line
 const isPolkadot = typeof window !== 'undefined' && window.location.host.indexOf('polkadot') !== -1;
 
-const WSS_POLKADOT = 'wss://poc3-rpc.polkadot.io/';
-const WSS_SUBSTRATE = 'wss://substrate-rpc.parity.io/';
+const WSS_NODES = {
+  parity: {
+    hosted: 'hosted by Parity',
+    nodes: {
+      alex: 'wss://poc3-rpc.polkadot.io/',
+      elm: 'wss://substrate-rpc.parity.io/'
+    }
+  },
+  unfra: {
+    hosted: 'hosted by UNfrastructure',
+    nodes: {
+      alex: 'wss://alex.unfrastructure.io/public/ws'
+    }
+  }
+};
 const LANGUAGE_DEFAULT = 'default';
 const LOCKING_DEFAULT = 'session';
 
@@ -19,8 +32,9 @@ const CRYPTOS: Options = [
 ];
 
 const ENDPOINTS: Options = [
-  { text: 'Alexander (Polkadot, hosted by Parity)', value: WSS_POLKADOT },
-  { text: 'Emberic Elm (Substrate, hosted by Parity)', value: WSS_SUBSTRATE },
+  { text: `Alexander (Polkadot, ${WSS_NODES.parity.hosted})`, value: WSS_NODES.parity.nodes.alex },
+  { text: `Alexander (Polkadot, ${WSS_NODES.unfra.hosted})`, value: WSS_NODES.unfra.nodes.alex },
+  { text: `Emberic Elm (Substrate, ${WSS_NODES.parity.hosted})`, value: WSS_NODES.parity.nodes.elm },
   { text: 'Local Node (127.0.0.1:9944)', value: 'ws://127.0.0.1:9944/' }
 ];
 
@@ -44,8 +58,8 @@ const UITHEMES: Options = [
 ];
 
 const ENDPOINT_DEFAULT = isPolkadot
-  ? WSS_POLKADOT
-  : WSS_SUBSTRATE;
+  ? WSS_NODES.parity.nodes.alex
+  : WSS_NODES.parity.nodes.elm;
 
 const UITHEME_DEFAULT = isPolkadot
   ? 'polkadot'