diff --git a/packages/docs/playwright/with-metamask.test.ts b/packages/docs/playwright/with-metamask.test.ts
index e4c189966..3dcb5e657 100644
--- a/packages/docs/playwright/with-metamask.test.ts
+++ b/packages/docs/playwright/with-metamask.test.ts
@@ -101,12 +101,8 @@ describe(`Browser: ${browserType.name()} with Metamask`, () => {
       const popupPage = await popupPromise
 
       await sleep(2000) // Wait for the popup to be fully loaded.
-      expect(
-        // if this link is visible, then the network does not match metamask records
-        await popupPage.isVisible(`//a[@href='https://metamask.zendesk.com/hc/en-us/articles/360057142392']`)
-      ).to.be.false
 
-      await popupPage.click(XPath.text('a', 'View all'))
+      await popupPage.click(XPath.text('a', 'View all details'))
       await waitForExpect(async () => {
         expect(await popupPage.isVisible(`//*[text()='${Optimism.chainName}']`)).to.be.true
         expect(await popupPage.isVisible(`//*[text()='${Optimism.rpcUrl}']`)).to.be.true
diff --git a/packages/example/playwright/with-metamask.ts b/packages/example/playwright/with-metamask.ts
index 2db1a2019..0bd914148 100644
--- a/packages/example/playwright/with-metamask.ts
+++ b/packages/example/playwright/with-metamask.ts
@@ -276,9 +276,7 @@ export const withMetamaskTest = (baseUrl: string) => {
 
         await waitForExpect(async () => {
           expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Goerli'))).to.be.true
           expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Optimism Goerli'))).to.be.true
         })
       })
 
@@ -286,11 +284,11 @@ export const withMetamaskTest = (baseUrl: string) => {
         await page.goto(`${baseUrl}multichain`)
 
         await waitForExpect(async () => {
-          expect(await page.isVisible(XPath.text('span', 'Chain id:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current block:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Ether balance:', 4))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Chain id:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current block:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Ether balance:', 2))).to.be.true
         })
       })
     })
diff --git a/packages/example/playwright/without-metamask.ts b/packages/example/playwright/without-metamask.ts
index d811e053d..04c136a06 100644
--- a/packages/example/playwright/without-metamask.ts
+++ b/packages/example/playwright/without-metamask.ts
@@ -90,9 +90,7 @@ export const withoutMetamaskTest = (baseUrl: string) => {
 
         await waitForExpect(async () => {
           expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Goerli'))).to.be.true
           expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Optimism Goerli'))).to.be.true
         })
       })
 
diff --git a/packages/example/src/entrypoint.tsx b/packages/example/src/entrypoint.tsx
index 0e55206a2..3c70f7d24 100644
--- a/packages/example/src/entrypoint.tsx
+++ b/packages/example/src/entrypoint.tsx
@@ -7,8 +7,6 @@ import {
   Localhost,
   MetamaskConnector,
   CoinbaseWalletConnector,
-  Goerli,
-  OptimismGoerli,
   Optimism,
 } from '@usedapp/core'
 import { App } from './App'
@@ -18,11 +16,7 @@ import { getDefaultProvider } from '@ethersproject/providers'
 
 const readOnlyUrls: Config['readOnlyUrls'] = {
   [Mainnet.chainId]: process.env.MAINNET_URL || getDefaultProvider('mainnet'),
-  [Goerli.chainId]: process.env.MAINNET_URL
-    ? process.env.MAINNET_URL.replace('mainnet', 'goerli')
-    : getDefaultProvider('goerli'),
   [Optimism.chainId]: 'https://mainnet.optimism.io',
-  [OptimismGoerli.chainId]: 'https://goerli.optimism.io',
 }
 
 if (process.env.LOCALHOST_URL) {
@@ -45,8 +39,7 @@ const config: Config = {
       projectId: 'bffbe493c0928ee125dc8f23e20167b7',
       chains: [Mainnet],
       rpcMap: {
-        1: 'https://mainnet.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd',
-        5: 'https://goerli.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd',
+        [Mainnet.chainId]: 'https://mainnet.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd',
       },
     }),
   },
diff --git a/packages/example/src/pages/Multichain.tsx b/packages/example/src/pages/Multichain.tsx
index 59cd2f958..454140016 100644
--- a/packages/example/src/pages/Multichain.tsx
+++ b/packages/example/src/pages/Multichain.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
 import { Container, MainContent, Section, SectionRow } from '../components/base/base'
-import { Goerli, Mainnet, Optimism, OptimismGoerli } from '@usedapp/core'
+import { Mainnet, Optimism } from '@usedapp/core'
 import { ChainState } from '../components/ChainState'
 import { Title } from '../typography/Title'
 import styled from 'styled-components'
 
-const chains = [Mainnet.chainId, Goerli.chainId, Optimism.chainId, OptimismGoerli.chainId]
+const chains = [Mainnet.chainId, Optimism.chainId]
 
 export const Multichain = () => {
   return (