diff --git a/package.json b/package.json
index a9cfa452d..4d2a9fcf5 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "type-check": "tsc --noEmit",
     "deploy:s3": "bash scripts/deploy-s3.sh",
     "postinstall": "husky install",
-    "codegen:apollo": "apollo client:codegen --endpoint=https://v4.subgraph.goerli.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/",
+    "codegen:apollo": "apollo client:codegen --endpoint=https://v4.subgraph.mumbai.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/",
     "storybook": "cross-env NODE_ENV=test start-storybook -p 6006 --quiet",
     "storybook:build": "cross-env NODE_ENV=test build-storybook"
   },
diff --git a/src/@utils/ocean/index.ts b/src/@utils/ocean/index.ts
index 729f8f1b9..3bd61c3f6 100644
--- a/src/@utils/ocean/index.ts
+++ b/src/@utils/ocean/index.ts
@@ -51,8 +51,8 @@ export function getDevelopmentConfig(): Config {
     // fixedRateExchangeAddress: contractAddresses.development?.FixedRateExchange,
     // metadataContractAddress: contractAddresses.development?.Metadata,
     // oceanTokenAddress: contractAddresses.development?.Ocean,
-    // There is no subgraph in barge so we hardcode the Goerli one for now
-    subgraphUri: 'https://v4.subgraph.goerli.oceanprotocol.com'
+    // There is no subgraph in barge so we hardcode the Polygon Mumbai one for now
+    subgraphUri: 'https://v4.subgraph.mumbai.oceanprotocol.com'
   } as Config
 }
 
diff --git a/src/@utils/wallet/index.ts b/src/@utils/wallet/index.ts
index d8de6b5e1..bebc52949 100644
--- a/src/@utils/wallet/index.ts
+++ b/src/@utils/wallet/index.ts
@@ -4,7 +4,6 @@ import {
   mainnet,
   polygon,
   optimism,
-  goerli,
   polygonMumbai,
   sepolia
 } from 'wagmi/chains'
@@ -37,7 +36,7 @@ export const wagmiClient = createClient(
     appName: 'Ocean Market',
     infuraId: process.env.NEXT_PUBLIC_INFURA_PROJECT_ID,
     // TODO: mapping between appConfig.chainIdsSupported and wagmi chainId
-    chains: [mainnet, polygon, optimism, goerli, polygonMumbai, sepolia],
+    chains: [mainnet, polygon, optimism, polygonMumbai, sepolia],
     walletConnectProjectId: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID
   })
 )