diff --git a/plugins/auth-backend/src/identity/TokenFactory.ts b/plugins/auth-backend/src/identity/TokenFactory.ts
index 60f827b51f..f121f2522d 100644
--- a/plugins/auth-backend/src/identity/TokenFactory.ts
+++ b/plugins/auth-backend/src/identity/TokenFactory.ts
@@ -39,11 +39,10 @@ export class TokenFactory implements TokenIssuer {
   private privateKeyPromise?: Promise<JSONWebKey>;
 
   constructor(options: Options) {
-    const { issuer, logger, keyStore, keyDuration } = options;
-    this.issuer = issuer;
-    this.keyStore = keyStore;
-    this.keyDuration = keyDuration;
-    this.logger = logger.child({ service: 'issuer' });
+    this.issuer = options.issuer;
+    this.logger = options.logger;
+    this.keyStore = options.keyStore;
+    this.keyDuration = options.keyDuration;
   }
 
   async issueToken(claims: TokenParams): Promise<string> {
diff --git a/plugins/auth-backend/src/identity/router.ts b/plugins/auth-backend/src/identity/router.ts
index 9155bed9e8..7ba0835ecd 100644
--- a/plugins/auth-backend/src/identity/router.ts
+++ b/plugins/auth-backend/src/identity/router.ts
@@ -25,12 +25,7 @@ export type Options = {
 };
 
 export function createOidcRouter(options: Options) {
-  const {
-    logger: baseLogger,
-    keyStore,
-    baseUrl = 'http://localhost:7000/auth',
-  } = options;
-  const logger = baseLogger.child({ router: 'identity' });
+  const { logger, keyStore, baseUrl } = options;
 
   const router = Router();
 
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index d57225daf6..7809bc7ef8 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -41,13 +41,13 @@ export async function createRouter(
 
   const keyStore = await DatabaseKeyStore.create({
     database: options.database,
-    logger,
+    logger: logger.child({ component: 'db-key-store' }),
     keyDuration,
   });
   const issuer = new TokenFactory({
     issuer: baseUrl,
     keyStore,
-    logger,
+    logger: logger.child({ component: 'token-factory' }),
     keyDuration,
   });
 
@@ -112,7 +112,13 @@ export async function createRouter(
     }
   }
 
-  router.use(createOidcRouter({ logger, keyStore, baseUrl }));
+  router.use(
+    createOidcRouter({
+      logger: logger.child({ component: 'oidc-router' }),
+      keyStore,
+      baseUrl,
+    }),
+  );
 
   return router;
 }