diff --git a/packages/gumdrop/src/contexts/ConnectionContext.tsx b/packages/gumdrop/src/contexts/ConnectionContext.tsx
index 3442a7d..d438a4b 100644
--- a/packages/gumdrop/src/contexts/ConnectionContext.tsx
+++ b/packages/gumdrop/src/contexts/ConnectionContext.tsx
@@ -36,12 +36,12 @@ export type Endpoint = {
 export const ENDPOINTS: Array<Endpoint> = [
   {
     name: 'mainnet-beta',
-    url: 'https://api.metaplex.solana.com',
+    url: 'https://api.mainnet-beta.solana.com',
     chainId: ChainId.MainnetBeta,
   },
   {
     name: 'devnet',
-    url: 'https://metaplex.devnet.rpcpool.com/',
+    url: 'https://api.devnet.solana.com/',
     chainId: ChainId.Devnet,
   },
 ];
diff --git a/packages/gumdrop/src/utils/transactions.ts b/packages/gumdrop/src/utils/transactions.ts
index b058507..4157c46 100644
--- a/packages/gumdrop/src/utils/transactions.ts
+++ b/packages/gumdrop/src/utils/transactions.ts
@@ -28,7 +28,7 @@ export const getUnixTs = () => {
 
 export const envFor = (connection: Connection): string => {
   const endpoint = (connection as any)._rpcEndpoint;
-  const regex = /https:\/\/metaplex.([^.]*).rpcpool.com/;
+  const regex = /https:\/\/api.([^.]*).solana.com/;
   const match = endpoint.match(regex);
   if (match && match[1]) {
     return match[1];