diff --git a/ape_tenderly/__init__.py b/ape_tenderly/__init__.py
index c4f030b..98760d5 100644
--- a/ape_tenderly/__init__.py
+++ b/ape_tenderly/__init__.py
@@ -6,8 +6,6 @@
     "ethereum": [
         ("mainnet", TenderlyGatewayProvider),
         ("mainnet-fork", TenderlyForkProvider),
-        ("goerli", TenderlyGatewayProvider),
-        ("goerli-fork", TenderlyForkProvider),
         ("sepolia", TenderlyGatewayProvider),
         ("sepolia-fork", TenderlyForkProvider),
     ],
@@ -19,19 +17,19 @@
     ],
     "arbitrum": [
         ("mainnet-fork", TenderlyForkProvider),
-        ("goerli-fork", TenderlyForkProvider),
+        ("sepolia-fork", TenderlyForkProvider),
     ],
     "optimism": [
         ("mainnet", TenderlyGatewayProvider),
         ("mainnet-fork", TenderlyForkProvider),
-        ("goerli", TenderlyGatewayProvider),
-        ("goerli-fork", TenderlyForkProvider),
+        ("sepolia", TenderlyGatewayProvider),
+        ("sepolia-fork", TenderlyForkProvider),
     ],
     "base": [
         ("mainnet", TenderlyGatewayProvider),
         ("mainnet-fork", TenderlyForkProvider),
-        ("goerli", TenderlyGatewayProvider),
-        ("goerli-fork", TenderlyForkProvider),
+        ("sepolia", TenderlyGatewayProvider),
+        ("sepolia-fork", TenderlyForkProvider),
     ],
     "avalance": [
         ("mainnet-fork", TenderlyForkProvider),
diff --git a/ape_tenderly/client.py b/ape_tenderly/client.py
index 82d02d1..318cbcb 100644
--- a/ape_tenderly/client.py
+++ b/ape_tenderly/client.py
@@ -81,7 +81,7 @@ def remove_fork(self, fork_id: str):
 
     def get_gateway_rpc_uri(self, ecosystem_name: str, network_name: str) -> str:
         if ecosystem_name == "ethereum":
-            # e.g. Sepolia, Goerli, etc.
+            # e.g. Sepolia, etc.
             network_subdomain = network_name
         elif network_name == "mainnet":
             # e.g. Polygon mainnet, Optimism, etc.
diff --git a/ape_tenderly/provider.py b/ape_tenderly/provider.py
index 8373921..09497f2 100644
--- a/ape_tenderly/provider.py
+++ b/ape_tenderly/provider.py
@@ -91,11 +91,11 @@ def connect(self):
             raise ProviderError(f"Failed to connect to Tenderly Gateway.\n{repr(err)}") from err
 
         # Any chain that *began* as PoA needs the middleware for pre-merge blocks
-        ethereum_goerli = 5
+        ethereum_sepolia = 11155111
         optimism = (10, 420)
         polygon = (137, 80001)
 
-        if chain_id in (ethereum_goerli, *optimism, *polygon):
+        if chain_id in (ethereum_sepolia, *optimism, *polygon):
             self._web3.middleware_onion.inject(geth_poa_middleware, layer=0)
 
         self._web3.eth.set_gas_price_strategy(rpc_gas_price_strategy)