diff --git a/bun.lockb b/bun.lockb
index 4eb0b3c..7968109 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index e5b4ef1..f9faad2 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@coinbase/onchainkit": "^0.35.6",
+    "@coinbase/onchainkit": "^0.36.10",
     "next": "^14.2.5",
     "permissionless": "^0.1.26",
     "react": "^18",
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 42dc42b..394adce 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,7 +3,6 @@ import { NEXT_PUBLIC_URL } from '../config';
 
 import './global.css';
 import '@coinbase/onchainkit/styles.css';
-import '@rainbow-me/rainbowkit/styles.css';
 import dynamic from 'next/dynamic';
 
 const OnchainProviders = dynamic(
diff --git a/src/app/page.tsx b/src/app/page.tsx
index cab923f..ec32b00 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,6 @@ import { ONCHAINKIT_LINK } from 'src/links';
 import OnchainkitSvg from 'src/svg/OnchainkitSvg';
 import { useAccount } from 'wagmi';
 import LoginButton from '../components/LoginButton';
-import SignupButton from '../components/SignupButton';
 
 export default function Page() {
   const { address } = useAccount();
@@ -23,10 +22,7 @@ export default function Page() {
           >
             <OnchainkitSvg />
           </a>
-          <div className="flex items-center gap-3">
-            <SignupButton />
-            {!address && <LoginButton />}
-          </div>
+          <div className="flex items-center gap-3">{<LoginButton />}</div>
         </div>
       </section>
       <section className="templateSection flex w-full flex-col items-center justify-center gap-4 rounded-xl bg-gray-100 px-2 py-4 md:grow">
diff --git a/src/components/LoginButton.tsx b/src/components/LoginButton.tsx
index 6950107..a188110 100644
--- a/src/components/LoginButton.tsx
+++ b/src/components/LoginButton.tsx
@@ -2,11 +2,5 @@
 import WalletWrapper from './WalletWrapper';
 
 export default function LoginButton() {
-  return (
-    <WalletWrapper
-      className="min-w-[90px]"
-      text="Log in"
-      withWalletAggregator={true}
-    />
-  );
+  return <WalletWrapper className="min-w-[90px]" text="Log in" />;
 }
diff --git a/src/components/OnchainProviders.tsx b/src/components/OnchainProviders.tsx
index 4c6ee7b..a7a3332 100644
--- a/src/components/OnchainProviders.tsx
+++ b/src/components/OnchainProviders.tsx
@@ -1,6 +1,5 @@
 'use client';
 import { OnchainKitProvider } from '@coinbase/onchainkit';
-import { RainbowKitProvider } from '@rainbow-me/rainbowkit';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import { base } from 'viem/chains';
@@ -18,10 +17,21 @@ function OnchainProviders({ children }: Props) {
   return (
     <WagmiProvider config={wagmiConfig}>
       <QueryClientProvider client={queryClient}>
-        <OnchainKitProvider apiKey={NEXT_PUBLIC_CDP_API_KEY} chain={base}>
-          <RainbowKitProvider modalSize="compact">
-            {children}
-          </RainbowKitProvider>
+        <OnchainKitProvider
+          apiKey={NEXT_PUBLIC_CDP_API_KEY}
+          config={{
+            appearance: {
+              name: 'OnchainKit Template',
+              mode: 'auto',
+              theme: 'default',
+            },
+            wallet: {
+              display: 'modal',
+            },
+          }}
+          chain={base}
+        >
+          {children}
         </OnchainKitProvider>
       </QueryClientProvider>
     </WagmiProvider>
diff --git a/src/components/SignupButton.test.tsx b/src/components/SignupButton.test.tsx
deleted file mode 100644
index 076f77d..0000000
--- a/src/components/SignupButton.test.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { render, screen } from '@testing-library/react';
-import { beforeAll, describe, expect, it } from 'vitest';
-import { http, WagmiProvider, createConfig } from 'wagmi';
-import { base } from 'wagmi/chains';
-import { mock } from 'wagmi/connectors';
-import SignupButton from './SignupButton';
-
-const config = createConfig({
-  chains: [base],
-  connectors: [
-    mock({
-      accounts: [
-        '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-        '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
-        '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
-      ],
-    }),
-  ],
-  transports: {
-    [base.id]: http(),
-  },
-});
-
-const queryClient = new QueryClient();
-
-const renderWithProviders = (component: JSX.Element) => {
-  return render(
-    <WagmiProvider config={config}>
-      <QueryClientProvider client={queryClient}>
-        {component}
-      </QueryClientProvider>
-    </WagmiProvider>,
-  );
-};
-
-describe('SignupButton', () => {
-  beforeAll(() => {
-    Object.defineProperty(window, 'matchMedia', {
-      writable: true,
-      value: (query: string) => ({
-        matches: false,
-        media: query,
-        onchange: null,
-        addListener: () => {}, // Deprecated
-        removeListener: () => {}, // Deprecated
-        addEventListener: () => {},
-        removeEventListener: () => {},
-        dispatchEvent: () => false,
-      }),
-    });
-  });
-  it('should render', () => {
-    renderWithProviders(<SignupButton />);
-    const wallet = screen.getByTestId('ockConnectWallet_Container');
-    expect(wallet).toBeInTheDocument();
-  });
-});
diff --git a/src/components/SignupButton.tsx b/src/components/SignupButton.tsx
deleted file mode 100644
index ded5d8e..0000000
--- a/src/components/SignupButton.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-'use client';
-import WalletWrapper from './WalletWrapper';
-
-export default function SignupButton() {
-  return (
-    <WalletWrapper
-      className="ockConnectWallet_Container min-w-[90px] shrink bg-slate-200 text-[#030712] hover:bg-slate-300"
-      text="Sign up"
-    />
-  );
-}
diff --git a/src/components/WalletWrapper.tsx b/src/components/WalletWrapper.tsx
index 7c37b20..4939751 100644
--- a/src/components/WalletWrapper.tsx
+++ b/src/components/WalletWrapper.tsx
@@ -19,21 +19,15 @@ import {
 type WalletWrapperParams = {
   text?: string;
   className?: string;
-  withWalletAggregator?: boolean;
 };
 export default function WalletWrapper({
   className,
   text,
-  withWalletAggregator = false,
 }: WalletWrapperParams) {
   return (
     <>
       <Wallet>
-        <ConnectWallet
-          withWalletAggregator={withWalletAggregator}
-          text={text}
-          className={className}
-        >
+        <ConnectWallet text={text} className={className}>
           <Avatar className="h-6 w-6" />
           <Name />
         </ConnectWallet>
diff --git a/src/wagmi.ts b/src/wagmi.ts
index 60ef124..8345480 100644
--- a/src/wagmi.ts
+++ b/src/wagmi.ts
@@ -1,13 +1,9 @@
 'use client';
-import { connectorsForWallets } from '@rainbow-me/rainbowkit';
-import {
-  coinbaseWallet,
-  metaMaskWallet,
-  rainbowWallet,
-} from '@rainbow-me/rainbowkit/wallets';
+
 import { useMemo } from 'react';
 import { http, createConfig } from 'wagmi';
 import { base, baseSepolia } from 'wagmi/chains';
+import { coinbaseWallet } from 'wagmi/connectors';
 import { NEXT_PUBLIC_WC_PROJECT_ID } from './config';
 
 export function useWagmiConfig() {
@@ -19,28 +15,15 @@ export function useWagmiConfig() {
   }
 
   return useMemo(() => {
-    const connectors = connectorsForWallets(
-      [
-        {
-          groupName: 'Recommended Wallet',
-          wallets: [coinbaseWallet],
-        },
-        {
-          groupName: 'Other Wallets',
-          wallets: [rainbowWallet, metaMaskWallet],
-        },
-      ],
-      {
-        appName: 'onchainkit',
-        projectId,
-      },
-    );
-
     const wagmiConfig = createConfig({
       chains: [base, baseSepolia],
       // turn off injected provider discovery
       multiInjectedProviderDiscovery: false,
-      connectors,
+      connectors: [
+        coinbaseWallet({
+          preference: 'all',
+        }),
+      ],
       ssr: true,
       transports: {
         [base.id]: http(),
@@ -49,5 +32,5 @@ export function useWagmiConfig() {
     });
 
     return wagmiConfig;
-  }, [projectId]);
+  }, []);
 }