diff --git a/chainIdRpcs.json b/chainIdRpcs.json
index 93491c9..fa20c37 100644
--- a/chainIdRpcs.json
+++ b/chainIdRpcs.json
@@ -57,6 +57,9 @@
     "https://demeter-testnet.webb.tools"
   ],
   "4006": [
-    "https://tangle-standalone-archive.webb.tools"
+    "https://rpc.tangle.tools"
+  ],
+  "1081": [
+    "ws://3.144.199.9:9944"
   ]
 }
diff --git a/faucet-frontend/src/components/ClaimFundsForm.tsx b/faucet-frontend/src/components/ClaimFundsForm.tsx
index 2a5d19c..06209f5 100644
--- a/faucet-frontend/src/components/ClaimFundsForm.tsx
+++ b/faucet-frontend/src/components/ClaimFundsForm.tsx
@@ -13,6 +13,7 @@ type Chain = EvmChain | SubstrateChain;
 const ClaimFundsForm: React.FC<ClaimFundsFormProps> = ({ accessToken }) => {
   const [chain, setChain] = useState<Chain>({ Evm: 3884533461 });
   const [address, setAddress] = useState<string>("");
+  const [onlyNativeToken, setOnlyNativeToken] = useState<boolean>(true);
 
   const claimFunds = async () => {
     // Implement your claim funds logic here
@@ -27,14 +28,15 @@ const ClaimFundsForm: React.FC<ClaimFundsFormProps> = ({ accessToken }) => {
               type: (chain as EvmChain).Evm
                 ? "ethereum"
                 : (chain as SubstrateChain).Substrate
-                ? "substrate"
-                : "Unknown",
+                  ? "substrate"
+                  : "Unknown",
               value: address,
             },
             typedChainId: {
               type: (chain as EvmChain).Evm ? "Evm" : "Substrate",
               id: (chain as EvmChain).Evm || (chain as SubstrateChain).Substrate,
             },
+            onlyNativeToken,
           },
         }),
         {
@@ -86,9 +88,8 @@ const ClaimFundsForm: React.FC<ClaimFundsFormProps> = ({ accessToken }) => {
         <option value={JSON.stringify({ Evm: 3884533461 })}>Athena</option>
         <option value={JSON.stringify({ Evm: 3884533462 })}>Hermes</option>
         <option value={JSON.stringify({ Evm: 3884533463 })}>Demeter</option>
-        <option value={JSON.stringify({ Substrate: 1081 })}>Tangle Standalone</option>
-        <option value={JSON.stringify({ Evm: 5 })}>Gorli</option>
-        <option value={JSON.stringify({ Evm: 80001 })}>Mumbai</option>
+        <option value={JSON.stringify({ Evm: 4006 })}>Tangle EVM</option>
+        <option value={JSON.stringify({ Substrate: 1081 })}>Tangle</option>
       </select>
 
       <label htmlFor="address">Address:</label>
@@ -99,6 +100,17 @@ const ClaimFundsForm: React.FC<ClaimFundsFormProps> = ({ accessToken }) => {
         onChange={(event) => setAddress(event.target.value)}
       />
 
+      <input
+        id="only-native-token"
+        type="checkbox"
+        onChange={(event) => setOnlyNativeToken(event.target.checked)}
+        checked={onlyNativeToken}
+      >
+      </input>
+
+      <label htmlFor="only-native-token">
+        {onlyNativeToken ? "Only Native Token" : "ERC20/Assets Tokens"}
+      </label>
       <button
         className="submit-button"
         disabled={accessToken === null ? true : false}
@@ -106,7 +118,7 @@ const ClaimFundsForm: React.FC<ClaimFundsFormProps> = ({ accessToken }) => {
       >
         Claim
       </button>
-    </form>
+    </form >
   );
 };
 
diff --git a/src/helpers/files.rs b/src/helpers/files.rs
index 49bd17e..c60657f 100644
--- a/src/helpers/files.rs
+++ b/src/helpers/files.rs
@@ -48,10 +48,11 @@ pub fn get_evm_rpc_url(chain_id: u64) -> String {
     rpc_data[0].clone()
 }
 
-pub fn get_substrate_rpc_url(_chain_id: u64) -> String {
-    // TODO: Decide if we want to push this into config
-    let url = "wss://tangle-standalone-archive.webb.tools:443";
-    url.to_string()
+pub fn get_substrate_rpc_url(chain_id: u64) -> String {
+    let rpc_map = read_rpc_data();
+    let binding = vec!["ws://localhost:9944".to_string()];
+    let rpc_data = rpc_map.get(&chain_id).unwrap_or(&binding);
+    rpc_data[0].clone()
 }
 
 pub fn get_evm_token_address(chain_id: u64) -> [u8; 20] {
diff --git a/src/main.rs b/src/main.rs
index 1ad63fa..eb010ab 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -299,5 +299,5 @@ async fn rocket() -> _ {
         .manage(cors.to_cors().unwrap())
         .manage(tx_sender)
         .mount("/", rocket_cors::catch_all_options_routes())
-        .mount("/", routes![auth::login::twitter, faucet::faucet,])
+        .mount("/", routes![auth::login::twitter, faucet::faucet])
 }
diff --git a/src/txes/networks.rs b/src/txes/networks.rs
index fd08ba7..cf56dbc 100644
--- a/src/txes/networks.rs
+++ b/src/txes/networks.rs
@@ -33,6 +33,7 @@ impl Network {
             "athena" => Some(Self::Athena),
             "demeter" => Some(Self::Demeter),
             "tangle-evm-testnet" => Some(Self::TangleEVMTestnet),
+            "tangle" => Some(Self::Tangle),
             _ => None,
         }
     }