diff --git a/packages/sample-servers/src/whoami/index.js b/packages/sample-servers/src/whoami/index.js
index 7d79715..caf4846 100644
--- a/packages/sample-servers/src/whoami/index.js
+++ b/packages/sample-servers/src/whoami/index.js
@@ -35,8 +35,10 @@ if (!MCP_AUTH_ISSUER) {
   throw new Error('MCP_AUTH_ISSUER environment variable is required');
 }
 
+const authServerConfig = await fetchServerConfig(MCP_AUTH_ISSUER, { type: 'oidc' });
+
 const mcpAuth = new MCPAuth({
-  server: await fetchServerConfig(MCP_AUTH_ISSUER, { type: 'oidc' }),
+  server: authServerConfig,
 });
 
 /**
@@ -47,7 +49,7 @@ const mcpAuth = new MCPAuth({
  * @type {(token: string) => Promise<AuthInfo>}
  */
 const verifyToken = async (token) => {
-  const { issuer, userinfoEndpoint } = mcpAuth.config.server.metadata;
+  const { issuer, userinfoEndpoint } = authServerConfig.metadata;
 
   if (!userinfoEndpoint) {
     throw new Error('Userinfo endpoint is not configured in the server metadata');
diff --git a/packages/sample-servers/tsup.todo-manager.dev.config.ts b/packages/sample-servers/tsup.todo-manager.dev.config.ts
index 76380ce..a5e338f 100644
--- a/packages/sample-servers/tsup.todo-manager.dev.config.ts
+++ b/packages/sample-servers/tsup.todo-manager.dev.config.ts
@@ -4,6 +4,7 @@ import { config as baseConfig } from './tsup.config.js';
 
 export default defineConfig({
   ...baseConfig,
-  watch: ['src/**/*.ts', '.env', '../../.env', '*.config.ts'],
+  entry: { 'todo-manager/index': 'src/todo-manager/index.ts' },
+  watch: ['src/todo-manager/**/*.ts', '.env'],
   onSuccess: 'node ./dist/todo-manager/index.js',
 });
diff --git a/packages/sample-servers/tsup.whoami.dev.config.ts b/packages/sample-servers/tsup.whoami.dev.config.ts
index 0425d47..101e75b 100644
--- a/packages/sample-servers/tsup.whoami.dev.config.ts
+++ b/packages/sample-servers/tsup.whoami.dev.config.ts
@@ -4,7 +4,7 @@ import { config as baseConfig } from './tsup.config.js';
 
 export default defineConfig({
   ...baseConfig,
-  entry: { 'todo-manager/index': 'src/todo-manager/todo-service/index.ts' },
-  watch: ['src/todo-manager/**/*.ts', '.env', '../../.env'],
-  onSuccess: 'node ./dist/todo-manager/index.js',
+  entry: { 'whoami/index': 'src/whoami/index.ts' },
+  watch: ['src/whoami/**/*.ts', '.env'],
+  onSuccess: 'node ./dist/whoami/index.js',
 });