diff --git a/src/wagmi.config.ts b/src/wagmi.config.ts
index 492314c..499a8b0 100644
--- a/src/wagmi.config.ts
+++ b/src/wagmi.config.ts
@@ -12,141 +12,10 @@ import {
 	serialize,
 	webSocket,
 } from 'wagmi'
-import { type KeyManager, webAuthn } from 'wagmi/tempo'
+import { KeyManager, webAuthn } from 'wagmi/tempo'
 
 const TEMPO_ENV = import.meta.env.VITE_TEMPO_ENV
 
-// Helper to convert ArrayBuffer to base64
-function arrayBufferToBase64(buffer: ArrayBuffer): string {
-	const bytes = new Uint8Array(buffer)
-	let binary = ''
-	for (let i = 0; i < bytes.byteLength; i++) {
-		binary += String.fromCharCode(bytes[i])
-	}
-	return btoa(binary)
-}
-
-// Properly serialize a WebAuthn credential for transmission
-function serializeCredential(credential: PublicKeyCredential) {
-	const response = credential.response as AuthenticatorAttestationResponse
-	return {
-		id: credential.id,
-		rawId: arrayBufferToBase64(credential.rawId),
-		type: credential.type,
-		authenticatorAttachment: credential.authenticatorAttachment,
-		response: {
-			attestationObject: arrayBufferToBase64(response.attestationObject),
-			clientDataJSON: arrayBufferToBase64(response.clientDataJSON),
-			...(response.getAuthenticatorData
-				? {
-						authenticatorData: arrayBufferToBase64(
-							response.getAuthenticatorData(),
-						),
-					}
-				: {}),
-		},
-	}
-}
-
-// Determine the key-manager URL at runtime (when methods are called, not at config time)
-// This avoids SSR/client hydration mismatches
-function getKeyManagerBaseUrl() {
-	if (typeof window !== 'undefined') {
-		const hostname = window.location.hostname
-		// Local dev or workers.dev preview
-		if (hostname === 'localhost' || hostname.endsWith('.workers.dev')) {
-			return 'https://key-manager.porto.workers.dev/keys'
-		}
-		// Production presto/mainnet domains
-		if (hostname.includes('presto') || hostname.includes('mainnet')) {
-			return 'https://keys.tempo.xyz/keys'
-		}
-	}
-	// SSR fallback based on env
-	return TEMPO_ENV === 'presto'
-		? 'https://keys.tempo.xyz/keys'
-		: 'https://key-manager-mainnet.porto.workers.dev/keys'
-}
-
-function fetchWithTimeout(
-	url: string,
-	options: RequestInit = {},
-	timeoutMs = 10000,
-) {
-	const controller = new AbortController()
-	const timeout = setTimeout(() => controller.abort(), timeoutMs)
-	return fetch(url, { ...options, signal: controller.signal }).finally(() =>
-		clearTimeout(timeout),
-	)
-}
-
-function getKeyManager() {
-	// Create a lazy key manager that determines the URL at method call time
-	// This ensures SSR and client use the same config structure
-	return {
-		async getChallenge() {
-			console.log('[KM] getChallenge')
-			const baseUrl = getKeyManagerBaseUrl()
-			const response = await fetchWithTimeout(`${baseUrl}/challenge`)
-			if (!response.ok)
-				throw new Error(`Failed to get challenge: ${response.statusText}`)
-			const result = (await response.json()) as {
-				challenge: `0x${string}`
-				rp?: { id: string; name: string }
-			}
-			console.log('[KM] getChallenge =>', result)
-			return result
-		},
-		async getPublicKey(parameters: { credential: { id: string } }) {
-			console.log('[KM] getPublicKey', parameters.credential.id)
-			const baseUrl = getKeyManagerBaseUrl()
-			const response = await fetchWithTimeout(
-				`${baseUrl}/${parameters.credential.id}`,
-			)
-			if (!response.ok) {
-				if (response.status === 404) {
-					throw new Error(
-						'This passkey is not registered. It may have been created on a different domain or environment. Please sign up to create a new passkey.',
-					)
-				}
-				throw new Error(`Failed to get public key: ${response.statusText}`)
-			}
-			const data = (await response.json()) as { publicKey: `0x${string}` }
-			console.log('[KM] getPublicKey =>', `${data.publicKey?.slice(0, 20)}...`)
-			return data.publicKey
-		},
-		async setPublicKey(parameters: {
-			credential: PublicKeyCredential
-			publicKey: `0x${string}`
-		}) {
-			console.log(
-				'[KM] setPublicKey',
-				parameters.credential.id,
-				`${parameters.publicKey.slice(0, 20)}...`,
-			)
-			const baseUrl = getKeyManagerBaseUrl()
-			const serializedCredential = serializeCredential(parameters.credential)
-			const response = await fetchWithTimeout(
-				`${baseUrl}/${parameters.credential.id}`,
-				{
-					method: 'POST',
-					headers: { 'Content-Type': 'application/json' },
-					body: JSON.stringify({
-						credential: serializedCredential,
-						publicKey: parameters.publicKey,
-					}),
-				},
-			)
-			if (!response.ok) {
-				const error = await response.text()
-				console.error('[KM] setPublicKey err', error)
-				throw new Error(`Failed to set public key: ${error}`)
-			}
-			console.log('[KM] setPublicKey ok')
-		},
-	} as ReturnType<typeof KeyManager.http>
-}
-
 export type WagmiConfig = ReturnType<typeof getWagmiConfig>
 
 export const getTempoChain = createIsomorphicFn()
@@ -205,7 +74,7 @@ export function getWagmiConfig() {
 		chains: [chain, tempoLocalnet],
 		connectors: [
 			webAuthn({
-				keyManager: getKeyManager(),
+				keyManager: KeyManager.http('https://keys.tempo.xyz'),
 				rpId: globalThis.location?.hostname,
 			}),
 		],