diff --git a/package.json b/package.json
index bb1af7ed..05935f37 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "@acusti/react-code-input": "^3.11.0",
     "@babel/preset-typescript": "^7.21.5",
     "@celo/rainbowkit-celo": "^0.11.1",
-    "@masa-finance/masa-sdk": "^2.2.1",
+    "@masa-finance/masa-sdk": "^3.0.0",
     "@metamask/providers": "^11.0.0",
     "@rainbow-me/rainbowkit": "^0.12.12",
     "babel-loader": "^9.1.2",
diff --git a/src/helpers/masa.ts b/src/helpers/masa.ts
index bca0b4d9..bf5d4422 100644
--- a/src/helpers/masa.ts
+++ b/src/helpers/masa.ts
@@ -4,18 +4,18 @@ import {
   Masa,
   NetworkName,
 } from '@masa-finance/masa-sdk';
-import { ethers } from 'ethers';
+import { Signer } from 'ethers';
 import { ArweaveConfig } from '../provider';
 
 export const createNewMasa = ({
-  wallet,
+  signer,
   environmentName,
   networkName = 'unknown',
   arweaveConfig,
   verbose,
   apiUrl,
 }: {
-  wallet: ethers.Signer | ethers.Wallet;
+  signer: Signer;
   environmentName: string;
   networkName?: NetworkName;
   arweaveConfig?: ArweaveConfig;
@@ -25,13 +25,14 @@ export const createNewMasa = ({
   const environment = environments.find(
     (environment: Environment) => environment.name === environmentName
   );
+
   if (!environment) {
     console.error(`Unable to find environment ${environmentName}`);
     return;
   }
 
   return new Masa({
-    wallet,
+    signer,
     apiUrl: apiUrl ?? environment.apiUrl,
     networkName,
     environment: environment.environment,
diff --git a/src/provider/configured-rainbowkit-provider/utils.ts b/src/provider/configured-rainbowkit-provider/utils.ts
index 9bc76f44..d555eb08 100644
--- a/src/provider/configured-rainbowkit-provider/utils.ts
+++ b/src/provider/configured-rainbowkit-provider/utils.ts
@@ -5,24 +5,24 @@ import {
 } from '@masa-finance/masa-sdk';
 import { Alfajores, Celo } from '@celo/rainbowkit-celo/chains';
 import {
-  Chain,
-  goerli,
   baseGoerli,
   bsc,
   bscTestnet,
-  mainnet,
+  Chain,
+  goerli,
+  mainnet as ethereum,
   polygon,
   polygonMumbai,
 } from 'wagmi/chains';
 
 const rainbowkitChains = [
   Alfajores,
+  Celo,
   baseGoerli,
   bsc,
   bscTestnet,
-  Celo,
   goerli,
-  mainnet,
+  ethereum,
   polygon,
   polygonMumbai,
 ];
@@ -30,7 +30,6 @@ const rainbowkitChains = [
 export type MasaNetworks = Partial<{
   goerli: Network;
   ethereum: Network;
-  mainnet: Network;
   alfajores: Network;
   celo: Network;
   mumbai: Network;
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
index 105f6d65..bf53a635 100644
--- a/src/provider/masa-context-provider.tsx
+++ b/src/provider/masa-context-provider.tsx
@@ -16,12 +16,12 @@ import {
   useSoulnames,
   useWallet,
 } from './modules';
-import { Signer, Wallet } from 'ethers';
+import { Signer } from 'ethers';
 import { MasaContext } from './masa-context';
 import { MasaShape } from './masa-shape';
 import { useScopes } from './modules/scopes/scopes';
 import { CustomGallerySBT } from 'components/masa-interface/pages/gallery/gallery';
-import { useCustomSBT, useCustomGallerySBT } from './modules/custom-sbts';
+import { useCustomGallerySBT, useCustomSBT } from './modules/custom-sbts';
 import { useRainbowKit } from './use-rainbowkit';
 import { useWagmi } from './modules/wagmi';
 import { useNetworkSwitch } from './use-network-switch';
@@ -42,7 +42,7 @@ export type EnvironmentNameEx = EnvironmentName & ('local' | 'stage');
 
 export interface MasaContextProviderProps extends MasaShape {
   noWallet?: boolean;
-  signer?: Wallet | Signer;
+  signer?: Signer;
   environmentName?: EnvironmentNameEx;
   arweaveConfig?: ArweaveConfig;
   customGallerySBT?: CustomGallerySBT[];
@@ -277,7 +277,7 @@ export const MasaContextProvider = ({
       if (!signer) return;
 
       const masa: Masa | undefined = createNewMasa({
-        wallet: signer,
+        signer,
         environmentName,
         networkName: currentNetwork?.networkName,
         arweaveConfig,
diff --git a/src/provider/modules/network/network.ts b/src/provider/modules/network/network.ts
index d9bd11f9..6beba762 100644
--- a/src/provider/modules/network/network.ts
+++ b/src/provider/modules/network/network.ts
@@ -1,4 +1,4 @@
-import { Signer, utils, Wallet } from 'ethers';
+import { Signer, utils } from 'ethers';
 import { useCallback, useEffect, useState } from 'react';
 import {
   getNetworkNameByChainId,
@@ -16,7 +16,7 @@ export type UseNetworkReturnValue = {
 };
 
 export type UseNetworkInputValue = {
-  provider?: Wallet | Signer;
+  provider?: Signer;
   useRainbowKitWalletConnect?: boolean;
 };
 
diff --git a/src/provider/modules/wagmi/use-wagmi.tsx b/src/provider/modules/wagmi/use-wagmi.tsx
index 4d85797b..60faa481 100644
--- a/src/provider/modules/wagmi/use-wagmi.tsx
+++ b/src/provider/modules/wagmi/use-wagmi.tsx
@@ -7,7 +7,7 @@ import {
   useSigner,
   useSwitchNetwork,
 } from 'wagmi';
-import { Signer } from 'ethers';
+import { Signer, Wallet } from 'ethers';
 import { useEffect } from 'react';
 
 export const useWagmi = ({
@@ -25,7 +25,7 @@ export const useWagmi = ({
     data: signer,
     isError: isSignerError,
     isLoading: isSignerLoading,
-  } = useSigner();
+  } = useSigner<Wallet>();
 
   const { isConnecting, isDisconnected, isReconnecting } = useAccount({
     onDisconnect: () => logout(),
@@ -33,14 +33,11 @@ export const useWagmi = ({
   const { disconnect } = useDisconnect();
 
   useEffect(() => {
-    if (isReconnecting) {
-      return;
-    }
-    if (isSignerLoading) {
+    if (isReconnecting || isSignerLoading) {
       return;
     }
 
-    setSigner(signer as Signer);
+    setSigner(signer as Wallet);
   }, [
     setSigner,
     chain,
diff --git a/src/provider/modules/wallet/wallet.ts b/src/provider/modules/wallet/wallet.ts
index bab6a988..c262eab2 100644
--- a/src/provider/modules/wallet/wallet.ts
+++ b/src/provider/modules/wallet/wallet.ts
@@ -1,6 +1,6 @@
 import { useQuery } from 'react-query';
 import { Masa, NetworkName } from '@masa-finance/masa-sdk';
-import { Signer, Wallet } from 'ethers';
+import { Signer } from 'ethers';
 import { useCallback, useMemo } from 'react';
 import { useAsync } from 'react-use';
 import { queryClient } from '../../masa-query-client';
@@ -71,7 +71,7 @@ export type UseWalletReturnType = {
 
 export const useWallet = (
   masa?: Masa,
-  signer?: Wallet | Signer
+  signer?: Signer
 ): UseWalletReturnType => {
   const { walletAddress, status, isLoading, isFetching, error, refetch } =
     useWalletQuery({ masa, signer });
diff --git a/yarn.lock b/yarn.lock
index 7b713038..0c6f414d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2107,19 +2107,19 @@
   dependencies:
     "@lit-labs/ssr-dom-shim" "^1.0.0"
 
-"@masa-finance/masa-contracts-identity@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@masa-finance/masa-contracts-identity/-/masa-contracts-identity-1.7.0.tgz#4248d1eae9d90a6e558be716b1a864358d44a48d"
-  integrity sha512-XewBQzADlZJ2tkxrXS9DSbPvwd9An0kBbLg12DpGtHWr4mxNQz8Gg+o0SebajYGAcMmJxvd+K6fsWUEr26l/ow==
+"@masa-finance/masa-contracts-identity@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@masa-finance/masa-contracts-identity/-/masa-contracts-identity-1.8.0.tgz#d32b9416a377a736b567a6bcbbedcf973314b269"
+  integrity sha512-cpUVyWmlOP3683MiSTYKlTOAgmYpGhOIsnCNpU/nq2nP4hUOzCX4O3lpFTUMHIZEY6yX36Y1Rg/bonc3ELLk5A==
   dependencies:
     ethers "~5.7.2"
 
-"@masa-finance/masa-sdk@^2.2.1":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-2.2.2.tgz#88aac4a27e8395708c0f1ca0a4528205d72c900a"
-  integrity sha512-RdR3vauOgD9+gS3PvtE371C1yMUfOZqsrrC2EsIUXRMwi5nMyBb83e7O4YkFdYZopchuqE16Gd/o5dSkPYNiQA==
+"@masa-finance/masa-sdk@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-3.0.0.tgz#db68ee5e0d9bb8bf2cc57c0a1854040fae376ccc"
+  integrity sha512-wChgdkHEfVhxd1s7LyWfj7Fr5iWICrawabjAvlvFhDOWneSHjbN0CfDkhUF2vGlMluFNJsCiSXKaW+LE7uXxOg==
   dependencies:
-    "@masa-finance/masa-contracts-identity" "^1.7.0"
+    "@masa-finance/masa-contracts-identity" "^1.8.0"
     "@masa-finance/masa-token" "^2.0.0"
     arweave "1.11.8"
     axios "^1.3.2"