diff --git a/src/components/FaucetButton.tsx b/src/components/FaucetButton.tsx
index 5d734767..17b0e7f1 100644
--- a/src/components/FaucetButton.tsx
+++ b/src/components/FaucetButton.tsx
@@ -4,7 +4,7 @@ import { Button, SvgIcon, Typography } from '@mui/material';
 import { useProtocolDataContext } from 'src/hooks/useProtocolDataContext';
 
 import { DarkTooltip } from './infoTooltips/DarkTooltip';
-import { Link, ROUTES } from './primitives/Link';
+import { Link } from './primitives/Link';
 
 export const FaucetButton = () => {
   const { currentNetworkConfig } = useProtocolDataContext();
@@ -25,7 +25,7 @@ export const FaucetButton = () => {
           </SvgIcon>
         }
         component={Link}
-        href={ROUTES.faucet}
+        href={"https://faucet.etherlink.com"}
         variant="outlined"
         size="small"
       >
diff --git a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx
index f8954811..e36f38ef 100644
--- a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx
+++ b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx
@@ -28,11 +28,10 @@ export const SupplyAssetsListItem = ({
   isActive,
   isFreezed,
   detailsAddress,
-  showSwap,
   hideSupply,
 }: DashboardReserve) => {
   const { currentMarket } = useProtocolDataContext();
-  const { openSupply, openPSMSwap } = useModalContext();
+  const { openSupply } = useModalContext();
 
   // Hide the asset to prevent it from being supplied if supply cap has been reached
   const { supplyCap: supplyCapUsage } = useAssetCaps();
@@ -85,12 +84,12 @@ export const SupplyAssetsListItem = ({
             <Trans>Deposit</Trans>
           </Button>
         )}
-        {showSwap && (
+        {/* {showSwap && (
           <Button variant="contained" onClick={() => openPSMSwap(underlyingAsset)}>
             <Trans>Swap</Trans>
           </Button>
-        )}
-        {!(showSwap && !hideSupply) && (
+        )} */}
+        {!hideSupply && (
           <Button
             variant="outlined"
             component={Link}
diff --git a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListMobileItem.tsx b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListMobileItem.tsx
index 2f2af0d3..b2c89771 100644
--- a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListMobileItem.tsx
+++ b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListMobileItem.tsx
@@ -32,12 +32,11 @@ export const SupplyAssetsListMobileItem = ({
   isFreezed,
   underlyingAsset,
   detailsAddress,
-  showSwap,
   hideSupply,
 }: DashboardReserve) => {
   const { currentMarket } = useProtocolDataContext();
   const { dsr } = useAppDataContext();
-  const { openSupply, openPSMSwap } = useModalContext();
+  const { openSupply, } = useModalContext();
 
   // Hide the asset to prevent it from being supplied if supply cap has been reached
   const { supplyCap: supplyCapUsage } = useAssetCaps();
@@ -125,12 +124,12 @@ export const SupplyAssetsListMobileItem = ({
             <Trans>Deposit</Trans>
           </Button>
         )}
-        {showSwap && (
+        {/* {showSwap && (
           <Button variant="contained" onClick={() => openPSMSwap(underlyingAsset)} fullWidth>
             <Trans>Swap</Trans>
           </Button>
-        )}
-        {!(showSwap && !hideSupply) && (
+        )} */}
+        {!hideSupply && (
           <Button
             variant="outlined"
             component={Link}
diff --git a/src/store/root.ts b/src/store/root.ts
index 42fdbab5..11a1038f 100644
--- a/src/store/root.ts
+++ b/src/store/root.ts
@@ -1,4 +1,4 @@
-import { V3FaucetService } from '@aave/contract-helpers';
+// import { V3FaucetService } from '@aave/contract-helpers';
 import { enableMapSet } from 'immer';
 import { CustomMarket } from 'src/ui-config/marketsConfig';
 import { ENABLE_TESTNET, STAGING_ENV } from 'src/utils/marketsAndNetworksConfig';
@@ -61,37 +61,37 @@ if (typeof document !== 'undefined') {
 
 export const useStakeDataSubscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refetchStakeData();
-}, 60000);
+}, 30000);
 
 export const useWalletBalancesSubscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refetchWalletBalances();
-}, 60000);
+}, 30000);
 
 export const usePoolDataSubscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refreshPoolData();
-}, 60000);
+}, 30000);
 
 export const usePoolDataV3Subscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refreshPoolV3Data();
-}, 60000);
+}, 30000);
 
 export const usePoolDataV2Subscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refreshPoolV2Data();
-}, 60000);
+}, 30000);
 
 export const useIncentiveDataSubscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refreshIncentiveData();
-}, 60000);
+}, 30000);
 
 export const useGovernanceDataSubscription = createSingletonSubscriber(() => {
   return useRootStore.getState().refreshGovernanceData();
-}, 60000);
+}, 30000);
 
-let latest: V3FaucetService;
+// let latest: V3FaucetService;
 useRootStore.subscribe(
   (state) => state.currentMarketData,
   async (selected) => {
-    const { setIsFaucetPermissioned: setFaucetPermissioned, jsonRpcProvider } =
+    const { setIsFaucetPermissioned: setFaucetPermissioned } =
       useRootStore.getState();
     if (ENABLE_TESTNET || STAGING_ENV) {
       if (!selected.v3) {
@@ -102,19 +102,19 @@ useRootStore.subscribe(
       // If there are multiple calls in flight, we only want to use the result from the latest one.
       // Use the instance of the service to check if it's the latest one since it is recreated
       // everytime this subscription fires.
-      const service = new V3FaucetService(jsonRpcProvider(), selected.addresses.FAUCET);
-      latest = service;
-      service
-        .isPermissioned()
-        .then((isPermissioned) => {
-          if (latest === service) {
-            setFaucetPermissioned(isPermissioned);
-          }
-        })
-        .catch((e) => {
-          console.error('error checking faucet permission', e);
-          setFaucetPermissioned(false);
-        });
+      // const service = new V3FaucetService(jsonRpcProvider(), selected.addresses.FAUCET);
+      // latest = service;
+      // service
+      //   .isPermissioned()
+      //   .then((isPermissioned) => {
+      //     if (latest === service) {
+      //       setFaucetPermissioned(isPermissioned);
+      //     }
+      //   })
+      //   .catch((e) => {
+      //     console.error('error checking faucet permission', e);
+      //     setFaucetPermissioned(false);
+      //   });
     } else {
       setFaucetPermissioned(false);
     }
diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx
index e8fb4653..c54a1dd9 100644
--- a/src/ui-config/marketsConfig.tsx
+++ b/src/ui-config/marketsConfig.tsx
@@ -68,13 +68,14 @@ export const marketsData: {
       faucet: false,
     },
     addresses: {
-      LENDING_POOL_ADDRESS_PROVIDER: '0x5e580E0FF1981E7c916D6D9a036A8596E35fCE31'.toLowerCase(),
-      LENDING_POOL: '0x837286C1d05735448F7d1942144eE98602206773',
-      WALLET_BALANCE_PROVIDER: '0xAE0f454b171dA3C0e3B8a75c92A449964f90f7fd',
-      UI_POOL_DATA_PROVIDER: '0xA69C04756c604b63514cBF13466eCE70a5BF755b',
-      UI_INCENTIVE_DATA_PROVIDER: '0xdfe6cC78B0A1ed393246B9151c83036AD3e165b8',
-      WETH_GATEWAY: '0x2ae2308F17667980582c6580556317EBdb61cc68',
+      LENDING_POOL_ADDRESS_PROVIDER: '0x171A93836687ceE2892c7185B03391187a3f5a55'.toLowerCase(),
+      LENDING_POOL: '0x9a9fA5B9F1b98585235D040cb30BfFd3734A5d9b',
+      WALLET_BALANCE_PROVIDER: '0x6cAec669dB4C5f548A147B50c01f85696F71Ecbb',
+      UI_POOL_DATA_PROVIDER: '0x93E1497Bf67e89C9a7bdB6128cc98533B8627637',
+      UI_INCENTIVE_DATA_PROVIDER: '0xdf56fB6a781413D6Bd8309C7a630A4d57bC74c44',
+      WETH_GATEWAY: '0xb92A8614C5463948D75401910f84D7E8bA076140',
+      COLLECTOR: '0x250fB04547404729D22Eb8f9C498Da13E9980f2D',
     },
-    faucetUrl: 'https://faucet.plend.finance/receiveFaucetTokens',
+    faucetUrl: 'https://faucet.etherlink.com',
   },
-} as const;
+} as const;
\ No newline at end of file
diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts
index 5f4d1406..05796953 100644
--- a/src/ui-config/networksConfig.ts
+++ b/src/ui-config/networksConfig.ts
@@ -83,14 +83,14 @@ export const networkConfigs: Record<string, BaseNetworkConfig> = {
   [ChainId.etherlink_testnet]: {
     name: 'Etherlink Testnet',
     publicJsonRPCUrl: [
+      'https://etherlink-rollup-testnet-archive.zeeve.net/Rdj3r1npGPHxcDcQvOT/rpc',
       'https://node.ghostnet.etherlink.com',
-      'https://etherlink-ghostnet-6lcp5r.zeeve.net/rpc',
     ],
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'XTZ',
     wrappedBaseAssetSymbol: 'WXTZ',
     baseAssetDecimals: 18,
-    explorerLink: 'https://testnet-explorer.etherlink.com',
+    explorerLink: 'https://testnet.explorer.etherlink.com',
     isTestnet: true,
     networkLogoPath: '/icons/networks/etherlink.svg',
   },