diff --git a/content/wallets/pages/low-level-infra/gas-manager/gas-sponsorship/using-sdk/pay-gas-with-any-erc20-token.mdx b/content/wallets/pages/low-level-infra/gas-manager/gas-sponsorship/using-sdk/pay-gas-with-any-erc20-token.mdx
index aacd310f1..ee7b9056b 100644
--- a/content/wallets/pages/low-level-infra/gas-manager/gas-sponsorship/using-sdk/pay-gas-with-any-erc20-token.mdx
+++ b/content/wallets/pages/low-level-infra/gas-manager/gas-sponsorship/using-sdk/pay-gas-with-any-erc20-token.mdx
@@ -61,7 +61,13 @@ import { ethers } from "ethers";
 // --- Constants ---
 
 // Address of the ERC-4337 EntryPoint contract
-const ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
+// Supported EntryPoint addresses by version:
+// v0.6: 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789
+// v0.7: 0x0000000071727De22E5E9d8BAf0edAc6f37da032
+// v0.8: 0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108
+// Use the address matching your smart account's EntryPoint version.
+// This example uses v0.6; update to the appropriate version as needed.
+const ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // EntryPoint v0.6
 
 // ABI for the EntryPoint contract, specifically for the getNonce function
 const ENTRYPOINT_ABI = [
diff --git a/content/wallets/pages/resources/types.mdx b/content/wallets/pages/resources/types.mdx
index 77fb1bc0a..17b8edd9a 100644
--- a/content/wallets/pages/resources/types.mdx
+++ b/content/wallets/pages/resources/types.mdx
@@ -661,7 +661,7 @@ export type UserOperationRequest<
   TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
 > = (TEntryPointVersion extends "0.6.0"
   ? UserOperationRequest_v6
-  : TEntryPointVersion extends "0.7.0"
+  : TEntryPointVersion extends "0.7.0" | "0.8.0"
     ? UserOperationRequest_v7
     : never) &
   Eip7702ExtendedFields;
@@ -705,7 +705,7 @@ export type UserOperationStruct<
   TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
 > = (TEntryPointVersion extends "0.6.0"
   ? UserOperationStruct_v6
-  : TEntryPointVersion extends "0.7.0"
+  : TEntryPointVersion extends "0.7.0" | "0.8.0"
     ? UserOperationStruct_v7
     : never) &
   Eip7702ExtendedFields;
diff --git a/content/wallets/shared/estimate-gas-with-any-token.mdx b/content/wallets/shared/estimate-gas-with-any-token.mdx
index a995e9b46..c31a573b9 100644
--- a/content/wallets/shared/estimate-gas-with-any-token.mdx
+++ b/content/wallets/shared/estimate-gas-with-any-token.mdx
@@ -17,7 +17,7 @@ const quote = await client?.request({
     params: [
         {
         policyId: policyId,
-        entryPoint: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
+        entryPoint: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789', // EntryPoint v0.6; use 0x0000000071727De22E5E9d8BAf0edAc6f37da032 for v0.7 or 0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108 for v0.8
         dummySignature: userOp.signature,
         userOperation: {
             sender: userOp.sender,
diff --git a/src/openapi/portfolio/components/schemas.yaml b/src/openapi/portfolio/components/schemas.yaml
index dc8b52536..9b922a80b 100644
--- a/src/openapi/portfolio/components/schemas.yaml
+++ b/src/openapi/portfolio/components/schemas.yaml
@@ -309,8 +309,8 @@ UserOperationReceipt:
 EntryPoint:
   $ref: "#/Hex"
   title: Entrypoint Address
-  description: The entrypoint address the request should be sent through. This MUST be one of the entry points returned by the `supportedEntryPoints` RPC call.
-  default: "0x0000000071727De22E5E9d8BAf0edAc6f37da032"
+  description: The entrypoint address the request should be sent through. This MUST be one of the entry points returned by the `supportedEntryPoints` RPC call. Supported versions - v0.6: 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789, v0.7: 0x0000000071727De22E5E9d8BAf0edAc6f37da032, v0.8: 0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108.
+  default: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
 
 BlockOverride:
   $ref: "#/Hex"
diff --git a/src/openrpc/alchemy/bundler/bundler.yaml b/src/openrpc/alchemy/bundler/bundler.yaml
index 6cb0720f9..3572abfb5 100644
--- a/src/openrpc/alchemy/bundler/bundler.yaml
+++ b/src/openrpc/alchemy/bundler/bundler.yaml
@@ -415,8 +415,9 @@ methods:
         result:
           name: Supported entryPoints
           value:
-            - "0xcd01C8aa8995A59eB7B2627E69b40e0524B5ecf8"
-            - "0x7A0A0d159218E6a2f407B99173A2b12A6DDfC2a6"
+            - "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+            - "0x0000000071727De22E5E9d8BAf0edAc6f37da032"
+            - "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
 
   - name: eth_getUserOperationByHash
     description: |
@@ -610,7 +611,7 @@ methods:
           - name: UserOperation
             value: { sender: "0x...", nonce: "0x...", callData: "0x..." }
           - name: Entrypoint address
-            value: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+            value: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
         result:
           name: userOpHash
           value: