diff --git a/.env.sample b/.env.sample
index b4a4d84..30e1613 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,11 +1,9 @@
 NEXT_PUBLIC_INFURA_KEY=
 
 NEXT_PUBLIC_ETHEREUM_RPC_URL=
-NEXT_PUBLIC_GOERLI_RPC_URL=
 NEXT_PUBLIC_SEPOLIA_RPC_URL=
 
 NEXT_PUBLIC_ARBITRUM_RPC_URL=
-NEXT_PUBLIC_ARBITRUM_GOERLI_RPC_URL=
 NEXT_PUBLIC_ARBITRUM_NOVA_RPC_URL=
 NEXT_PUBLIC_ARBITRUM_SEPOLIA_RPC_URL=
 
diff --git a/src/app/recover-funds/[address]/RecoverFundsButton.tsx b/src/app/recover-funds/[address]/RecoverFundsButton.tsx
index 95f9049..5f46949 100644
--- a/src/app/recover-funds/[address]/RecoverFundsButton.tsx
+++ b/src/app/recover-funds/[address]/RecoverFundsButton.tsx
@@ -8,7 +8,7 @@ import {
 } from '@arbitrum/sdk';
 import { Inbox__factory } from '@arbitrum/sdk/dist/lib/abi/factories/Inbox__factory';
 import { getBaseFee } from '@arbitrum/sdk/dist/lib/utils/lib';
-import { goerli, mainnet, sepolia, useNetwork, useSigner } from 'wagmi';
+import { mainnet, sepolia, useNetwork, useSigner } from 'wagmi';
 import { getProviderFromChainId, getTargetChainId } from '@/utils';
 import { BigNumber } from 'ethers';
 import { ChainId } from '@/utils/network';
@@ -21,7 +21,6 @@ function getL1ChainIdFromL2ChainId(l2ChainId: number | undefined) {
 
   return {
     [ChainId.ArbitrumOne]: ChainId.Mainnet,
-    [ChainId.ArbitrumGoerli]: ChainId.Goerli,
     [ChainId.ArbitrumSepolia]: ChainId.Sepolia,
   }[l2ChainId];
 }
@@ -158,11 +157,7 @@ function RecoverFundsButton({
 
   if (!signer) return null;
 
-  if (
-    chain?.id !== mainnet.id &&
-    chain?.id !== goerli.id &&
-    chain?.id !== sepolia.id
-  ) {
+  if (chain?.id !== mainnet.id && chain?.id !== sepolia.id) {
     return (
       <div>Unknown L1 chain id. This chain is not supported by this tool</div>
     );
diff --git a/src/app/recover-funds/layout.tsx b/src/app/recover-funds/layout.tsx
index 3f3bdef..fcf8d61 100644
--- a/src/app/recover-funds/layout.tsx
+++ b/src/app/recover-funds/layout.tsx
@@ -24,8 +24,8 @@ export default function Layout({ children }: LayoutProps) {
         <h2>
           Tool to recover funds that are locked in an aliased L2 address.
           <br />
-          Connect to either Ethereum mainnet, Goerli or Sepolia to start the
-          recovery process.
+          Connect to either Ethereum mainnet or Sepolia to start the recovery
+          process.
         </h2>
       </header>
 
diff --git a/src/app/retryables-tracker-all/page.tsx b/src/app/retryables-tracker-all/page.tsx
index ad22919..39d69e6 100644
--- a/src/app/retryables-tracker-all/page.tsx
+++ b/src/app/retryables-tracker-all/page.tsx
@@ -1,6 +1,8 @@
 import { Suspense } from 'react';
 import PendingRetryables from '../retryables-tracker/[address]/PendingRetryables';
 
+export const dynamic = 'force-dynamic';
+
 const Page = async () => {
   return (
     <>
diff --git a/src/app/retryables-tracker/[address]/page.tsx b/src/app/retryables-tracker/[address]/page.tsx
index 2e1c6f9..57e1059 100644
--- a/src/app/retryables-tracker/[address]/page.tsx
+++ b/src/app/retryables-tracker/[address]/page.tsx
@@ -2,6 +2,8 @@ import Link from 'next/link';
 import { Suspense } from 'react';
 import PendingRetryables from './PendingRetryables';
 
+export const dynamic = 'force-dynamic';
+
 const Page = async ({ params }: { params: { address: string } }) => {
   const { address } = params;
 
diff --git a/src/components/Providers.tsx b/src/components/Providers.tsx
index 18ee7e7..5559c44 100644
--- a/src/components/Providers.tsx
+++ b/src/components/Providers.tsx
@@ -11,8 +11,6 @@ import { WagmiConfig, createClient, configureChains, Chain } from 'wagmi';
 import {
   mainnet,
   arbitrum,
-  arbitrumGoerli,
-  goerli,
   localhost,
   sepolia as sepoliaDefault,
 } from 'wagmi/chains';
@@ -76,15 +74,7 @@ export const arbitrumSepolia: Chain = {
 };
 
 const { provider, chains } = configureChains(
-  [
-    mainnet,
-    goerli,
-    sepolia,
-    arbitrum,
-    arbitrumGoerli,
-    arbitrumSepolia,
-    localhost,
-  ],
+  [mainnet, sepolia, arbitrum, arbitrumSepolia, localhost],
   [
     publicProvider(),
     jsonRpcProvider({
diff --git a/src/utils/getL2ToL1Messages.ts b/src/utils/getL2ToL1Messages.ts
index 02bb735..bc3261c 100644
--- a/src/utils/getL2ToL1Messages.ts
+++ b/src/utils/getL2ToL1Messages.ts
@@ -24,7 +24,7 @@ export const getL2ToL1Messages = async (
         const l2Provider = new JsonRpcProvider(rpcURL);
 
         // TODO
-        const l1ChainID = l2Network.partnerChainID as 1 | 5;
+        const l1ChainID = l2Network.partnerChainID as 1 | 11155111;
         const l1Provider = new JsonRpcProvider(supportedL1Networks[l1ChainID]);
         try {
           await l1Provider.getBlockNumber();
diff --git a/src/utils/getTargetChainId.ts b/src/utils/getTargetChainId.ts
index 95d2152..0c0eef2 100644
--- a/src/utils/getTargetChainId.ts
+++ b/src/utils/getTargetChainId.ts
@@ -10,10 +10,8 @@ export const getTargetChainId = (chainID: number | undefined) => {
   return (
     {
       [ChainId.Mainnet]: ChainId.ArbitrumOne,
-      [ChainId.Goerli]: ChainId.ArbitrumGoerli,
       [ChainId.Sepolia]: ChainId.ArbitrumSepolia,
       [ChainId.ArbitrumOne]: ChainId.ArbitrumOne,
-      [ChainId.ArbitrumGoerli]: ChainId.ArbitrumGoerli,
       [ChainId.ArbitrumSepolia]: ChainId.ArbitrumSepolia,
     }[chainID] || defaultTargetChainId
   );
diff --git a/src/utils/network.ts b/src/utils/network.ts
index 2b833ab..1a68057 100644
--- a/src/utils/network.ts
+++ b/src/utils/network.ts
@@ -8,11 +8,9 @@ if (typeof INFURA_KEY === 'undefined') {
 
 // L1
 const MAINNET_INFURA_RPC_URL = `https://mainnet.infura.io/v3/${INFURA_KEY}`;
-const GOERLI_INFURA_RPC_URL = `https://goerli.infura.io/v3/${INFURA_KEY}`;
 const SEPOLIA_INFURA_RPC_URL = `https://sepolia.infura.io/v3/${INFURA_KEY}`;
 // L2
 const ARBITRUM_INFURA_RPC_URL = `https://arbitrum-mainnet.infura.io/v3/${INFURA_KEY}`;
-const ARBITRUM_GOERLI_INFURA_RPC_URL = `https://arbitrum-goerli.infura.io/v3/${INFURA_KEY}`;
 const ARBITRUM_SEPOLIA_INFURA_RPC_URL = `https://arbitrum-sepolia.infura.io/v3/${INFURA_KEY}`;
 const LOCAL_GETH_RPC_URL = `http://localhost:8545`;
 
@@ -20,26 +18,22 @@ export enum ChainId {
   // L1
   Mainnet = 1,
   // L1 Testnets
-  Goerli = 5,
   Sepolia = 11155111,
   Local = 1337,
   // L2
   ArbitrumOne = 42161,
   ArbitrumNova = 42170,
   // L2 Testnets
-  ArbitrumGoerli = 421613,
   ArbitrumLocal = 412346,
   ArbitrumSepolia = 421614,
 }
 
 export const mapChainIdToName: Record<string, string> = {
   [ChainId.Mainnet]: 'Ethereum',
-  [ChainId.Goerli]: 'Goerli',
   [ChainId.Sepolia]: 'Sepolia',
   [ChainId.Local]: 'Local',
   [ChainId.ArbitrumOne]: 'Arbitrum One',
   [ChainId.ArbitrumNova]: 'Arbitrum Nova',
-  [ChainId.ArbitrumGoerli]: 'Arbitrum Goerli',
   [ChainId.ArbitrumLocal]: 'Arbitrum Local',
   [ChainId.ArbitrumSepolia]: 'Arbitrum Sepolia',
 };
@@ -54,10 +48,6 @@ export const rpcURLs: RpcMap = {
     fallback: MAINNET_INFURA_RPC_URL,
   }),
   // L1 Testnets
-  [ChainId.Goerli]: loadEnvironmentVariableWithFallback({
-    env: process.env.NEXT_PUBLIC_GOERLI_RPC_URL,
-    fallback: GOERLI_INFURA_RPC_URL,
-  }),
   [ChainId.Sepolia]: loadEnvironmentVariableWithFallback({
     env: process.env.NEXT_PUBLIC_SEPOLIA_RPC_URL,
     fallback: SEPOLIA_INFURA_RPC_URL,
@@ -72,10 +62,6 @@ export const rpcURLs: RpcMap = {
     fallback: 'https://nova.arbitrum.io/rpc',
   }),
   // L2 Testnets
-  [ChainId.ArbitrumGoerli]: loadEnvironmentVariableWithFallback({
-    env: process.env.NEXT_PUBLIC_ARBITRUM_GOERLI_RPC_URL,
-    fallback: ARBITRUM_GOERLI_INFURA_RPC_URL,
-  }),
   [ChainId.ArbitrumSepolia]: loadEnvironmentVariableWithFallback({
     env: process.env.NEXT_PUBLIC_ARBITRUM_SEPOLIA_RPC_URL,
     fallback: ARBITRUM_SEPOLIA_INFURA_RPC_URL,
@@ -93,7 +79,6 @@ export const rpcURLs: RpcMap = {
 
 export const supportedL1Networks: Partial<RpcMap> = {
   [ChainId.Mainnet]: rpcURLs[ChainId.Mainnet],
-  [ChainId.Goerli]: rpcURLs[ChainId.Goerli],
   [ChainId.Sepolia]: rpcURLs[ChainId.Sepolia],
   ...(isE2e ? { [ChainId.Local]: rpcURLs[ChainId.Local] } : {}),
 };
@@ -101,7 +86,6 @@ export const supportedL1Networks: Partial<RpcMap> = {
 export const supportedL2Networks: Partial<RpcMap> = {
   [ChainId.ArbitrumOne]: rpcURLs[ChainId.ArbitrumOne],
   [ChainId.ArbitrumNova]: rpcURLs[ChainId.ArbitrumNova],
-  [ChainId.ArbitrumGoerli]: rpcURLs[ChainId.ArbitrumGoerli],
   [ChainId.ArbitrumSepolia]: rpcURLs[ChainId.ArbitrumSepolia],
   ...(isE2e ? { [ChainId.ArbitrumLocal]: rpcURLs[ChainId.ArbitrumLocal] } : {}),
 };
diff --git a/tests/support/support.ts b/tests/support/support.ts
index 281937d..247af0f 100644
--- a/tests/support/support.ts
+++ b/tests/support/support.ts
@@ -6,6 +6,6 @@ Cypress.Keyboard.defaults({
 });
 
 before(() => {
-  // connect to goerli to avoid connecting to localhost twice and failing
-  cy.setupMetamask(Cypress.env('PRIVATE_KEY'), 'goerli');
+  // connect to sepolia to avoid connecting to localhost twice and failing
+  cy.setupMetamask(Cypress.env('PRIVATE_KEY'), 'sepolia');
 });