diff --git a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/package.json b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/package.json
index 099fe68..d09b85f 100644
--- a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/package.json
+++ b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/package.json
@@ -9,11 +9,11 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tailwindcss/postcss": "^4.1.1",
     "@tanstack/react-query": "^5.90.7",
     "lucide-react": "^0.487.0",
-    "next": "15.3.4",
+    "next": "15.4.8",
     "permissionless": "^0.2.46",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
@@ -27,7 +27,7 @@
     "@types/react-dom": "^19",
     "autoprefixer": "^10.4.21",
     "eslint": "^9",
-    "eslint-config-next": "15.3.4",
+    "eslint-config-next": "15.4.8",
     "postcss": "^8.5.3",
     "tailwindcss": "^4.1.1",
     "typescript": "^5"
diff --git a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/ConnectButton.tsx b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/ConnectButton.tsx
index f3746eb..d9d80c2 100644
--- a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/ConnectButton.tsx
+++ b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/ConnectButton.tsx
@@ -1,11 +1,22 @@
 "use client";
 
-import { useConnect } from "wagmi";
+import { useAccount, useChainId, useConnect, useSwitchChain } from "wagmi";
 import Button from "@/components/Button";
 import { metaMask } from "wagmi/connectors";
 
 export default function ConnectButton() {
     const { connect } = useConnect();
+    const { chainId: connectedChainId, isConnected } = useAccount();
+    const { switchChain } = useSwitchChain();
+    const currentChainId = useChainId();
+
+    if (isConnected && connectedChainId !== currentChainId) {
+        return (
+            <Button className="w-full space-x-2" onClick={() => switchChain({ chainId: currentChainId })}>
+                <span>Switch Chain</span>
+            </Button>
+        );
+    }
 
     return (
         <Button className="w-full space-x-2" onClick={() => connect({ connector: metaMask() })}>
diff --git a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/Steps.tsx b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/Steps.tsx
index 22ab5be..0fa6c42 100644
--- a/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/Steps.tsx
+++ b/packages/create-gator-app/templates/nextjs/advanced-permissions-starter/src/components/Steps.tsx
@@ -7,13 +7,14 @@ import RedeemPermissionButton from "@/components/RedeemPermissionButton";
 import GrantPermissionsButton from "./GrantPermissionsButton";
 import { useSessionAccount } from "@/providers/SessionAccountProvider";
 import { usePermissions } from "@/providers/PermissionProvider";
-import { useAccount } from "wagmi";
+import { useAccount, useChainId } from "wagmi";
 
 export default function Steps() {
   const [step, setStep] = useState<number>(1);
   const { sessionAccount } = useSessionAccount();
   const { permission } = usePermissions();
-  const { isConnected } = useAccount();
+  const { isConnected, chainId: connectedChainId } = useAccount();
+  const currentChainId = useChainId();
 
   useEffect(() => {
     if (!isConnected) {
@@ -25,12 +26,12 @@ export default function Steps() {
       setStep(4);
     } else if (sessionAccount) {
       setStep(3);
-    } else if (isConnected) {
+    } else if (isConnected && connectedChainId === currentChainId) {
       setStep(2);
     } else {
       setStep(1);
     }
-  }, [sessionAccount, permission, isConnected]);
+  }, [sessionAccount, permission, isConnected, connectedChainId, currentChainId]);
 
   return (
     <div className="max-w-4xl mx-auto p-3 space-y-8">
@@ -83,7 +84,7 @@ export default function Steps() {
               key and save it in the session storage. In production explore all other
               signers supported by the
               <a
-                href="https://docs.metamask.io/smart-accounts-kit/guides/smart-accounts/create-smart-account/"
+                href="https://docs.metamask.io/delegation-toolkit/guides/smart-accounts/create-smart-account/"
                 className="text-blue-500 hover:text-blue-400 underline ml-1"
                 target="_blank"
                 rel="noopener noreferrer"
diff --git a/packages/create-gator-app/templates/nextjs/delegation-starter/package.json b/packages/create-gator-app/templates/nextjs/delegation-starter/package.json
index 85dfadb..04e1f00 100644
--- a/packages/create-gator-app/templates/nextjs/delegation-starter/package.json
+++ b/packages/create-gator-app/templates/nextjs/delegation-starter/package.json
@@ -9,9 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tanstack/react-query": "^5.90.7",
-    "next": "15.3.4",
+    "next": "15.4.8",
     "permissionless": "^0.2.57",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
@@ -25,7 +25,7 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "eslint": "^9",
-    "eslint-config-next": "15.3.4",
+    "eslint-config-next": "15.4.8",
     "postcss": "^8.5.3",
     "tailwindcss": "^4.1.7",
     "typescript": "^5"
diff --git a/packages/create-gator-app/templates/nextjs/farcaster-starter/package.json b/packages/create-gator-app/templates/nextjs/farcaster-starter/package.json
index 681553b..65221c8 100644
--- a/packages/create-gator-app/templates/nextjs/farcaster-starter/package.json
+++ b/packages/create-gator-app/templates/nextjs/farcaster-starter/package.json
@@ -11,14 +11,14 @@
   "dependencies": {
     "@farcaster/miniapp-sdk": "^0.2.1",
     "@farcaster/miniapp-wagmi-connector": "^1.1.0",
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tanstack/react-query": "^5.76.1",
     "permissionless": "^0.2.57",
     "viem": "^2.38.4",
     "wagmi": "^2.18.2",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "next": "15.4.3"
+    "next": "15.4.8"
   },
   "devDependencies": {
     "typescript": "^5",
@@ -28,7 +28,7 @@
     "@tailwindcss/postcss": "^4",
     "tailwindcss": "^4",
     "eslint": "^9",
-    "eslint-config-next": "15.4.3",
+    "eslint-config-next": "15.4.8",
     "@eslint/eslintrc": "^3"
   }
 }
diff --git a/packages/create-gator-app/templates/nextjs/starter/package.json b/packages/create-gator-app/templates/nextjs/starter/package.json
index 0aa4d4f..e3815fb 100644
--- a/packages/create-gator-app/templates/nextjs/starter/package.json
+++ b/packages/create-gator-app/templates/nextjs/starter/package.json
@@ -9,10 +9,10 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tanstack/react-query": "^5.81.5",
     "permissionless": "^0.2.47",
-    "next": "15.3.4",
+    "next": "15.4.8",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "viem": "^2.31.6",
@@ -25,7 +25,7 @@
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "eslint": "^9",
-    "eslint-config-next": "15.3.4",
+    "eslint-config-next": "15.4.8",
     "tailwindcss": "^4",
     "typescript": "^5"
   }
diff --git a/packages/create-gator-app/templates/vite-react/delegation-starter/package.json b/packages/create-gator-app/templates/vite-react/delegation-starter/package.json
index 6f9c010..f99619e 100644
--- a/packages/create-gator-app/templates/vite-react/delegation-starter/package.json
+++ b/packages/create-gator-app/templates/vite-react/delegation-starter/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tanstack/react-query": "^5.90.7",
     "permissionless": "^0.2.57",
     "viem": "^2.38.6",
diff --git a/packages/create-gator-app/templates/vite-react/starter/package.json b/packages/create-gator-app/templates/vite-react/starter/package.json
index 20b312a..265bfe7 100644
--- a/packages/create-gator-app/templates/vite-react/starter/package.json
+++ b/packages/create-gator-app/templates/vite-react/starter/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@metamask/smart-accounts-kit": "^0.1.0",
+    "@metamask/smart-accounts-kit": "^0.2.0",
     "@tanstack/react-query": "^5.76.1",
     "permissionless": "^0.2.46",
     "viem": "^2.29.2",