diff --git a/pkg/api/src/api/middleware/auth.ts b/pkg/api/src/api/middleware/auth.ts
index 5dd9bb75..b86631ea 100644
--- a/pkg/api/src/api/middleware/auth.ts
+++ b/pkg/api/src/api/middleware/auth.ts
@@ -5,7 +5,7 @@ import { Context, Next } from 'koa';
 import loggerMain from '@/loaders/logger';
 import { UserModel } from '@/models/user';
 
-const logger = loggerMain.child({ label: 'middleware.auth' });
+const logger = loggerMain.child({ module: 'middleware.auth' });
 
 function removeCookie(ctx: Context) {
   ctx.cookies.set('petio-jwt', null, { expires: new Date(Date.now() - 2000) });
diff --git a/pkg/api/src/api/routes/login.ts b/pkg/api/src/api/routes/login.ts
index aa7c436c..e8d4278f 100644
--- a/pkg/api/src/api/routes/login.ts
+++ b/pkg/api/src/api/routes/login.ts
@@ -12,7 +12,7 @@ import { config } from '@/config/index';
 import loggerMain from '@/loaders/logger';
 import { GetUserByPlexID, UserModel, UserRole } from '@/models/user';
 
-const logger = loggerMain.child({ label: 'routes.login' });
+const logger = loggerMain.child({ module: 'routes.login' });
 
 function success(ctx: Context, user: any, isAdmin = false): void {
   const token = jwt.sign({ id: user.id, admin: isAdmin }, ctx.app.keys[0]);
diff --git a/pkg/api/src/infra/arr/radarr/v4/calendar.ts b/pkg/api/src/infra/arr/radarr/v4/calendar.ts
index 43d89e03..487c1345 100644
--- a/pkg/api/src/infra/arr/radarr/v4/calendar.ts
+++ b/pkg/api/src/infra/arr/radarr/v4/calendar.ts
@@ -139,7 +139,7 @@ export const CalendarSchema = z.array(
                     z.object({
                       order: z.number(),
                       name: z.string(),
-                      label: z.string(),
+                      module: z.string(),
                       unit: z.string(),
                       helpText: z.string(),
                       helpLink: z.string(),
diff --git a/pkg/api/src/infra/arr/radarr/v4/movie.ts b/pkg/api/src/infra/arr/radarr/v4/movie.ts
index 71b926be..eaed6d14 100644
--- a/pkg/api/src/infra/arr/radarr/v4/movie.ts
+++ b/pkg/api/src/infra/arr/radarr/v4/movie.ts
@@ -130,7 +130,7 @@ export const MovieSchema = z.object({
               z.object({
                 order: z.number(),
                 name: z.string(),
-                label: z.string(),
+                module: z.string(),
                 unit: z.string(),
                 helpText: z.string(),
                 helpLink: z.string(),
diff --git a/pkg/api/src/infra/arr/radarr/v4/queue.ts b/pkg/api/src/infra/arr/radarr/v4/queue.ts
index 370baa89..c1a8b4ee 100644
--- a/pkg/api/src/infra/arr/radarr/v4/queue.ts
+++ b/pkg/api/src/infra/arr/radarr/v4/queue.ts
@@ -149,7 +149,7 @@ export const QueueSchema = z.object({
                       z.object({
                         order: z.number(),
                         name: z.string(),
-                        label: z.string(),
+                        module: z.string(),
                         unit: z.string(),
                         helpText: z.string(),
                         helpLink: z.string(),
@@ -344,7 +344,7 @@ export const QueueSchema = z.object({
                 z.object({
                   order: z.number(),
                   name: z.string(),
-                  label: z.string(),
+                  module: z.string(),
                   unit: z.string().optional(),
                   helpText: z.string().optional(),
                   helpLink: z.string().optional(),
diff --git a/pkg/api/src/infra/arr/radarr/v4/tag.ts b/pkg/api/src/infra/arr/radarr/v4/tag.ts
index b2666465..e15c6dd5 100644
--- a/pkg/api/src/infra/arr/radarr/v4/tag.ts
+++ b/pkg/api/src/infra/arr/radarr/v4/tag.ts
@@ -2,7 +2,7 @@ import { makeApi } from '@zodios/core';
 import { z } from 'zod';
 
 export const TagSchema = z.object({
-  label: z.string(),
+  module: z.string(),
   id: z.number(),
 });
 export type Tag = z.infer<typeof TagSchema>;
diff --git a/pkg/api/src/infra/arr/sonarr/v3/tag.ts b/pkg/api/src/infra/arr/sonarr/v3/tag.ts
index b2666465..e15c6dd5 100644
--- a/pkg/api/src/infra/arr/sonarr/v3/tag.ts
+++ b/pkg/api/src/infra/arr/sonarr/v3/tag.ts
@@ -2,7 +2,7 @@ import { makeApi } from '@zodios/core';
 import { z } from 'zod';
 
 export const TagSchema = z.object({
-  label: z.string(),
+  module: z.string(),
   id: z.number(),
 });
 export type Tag = z.infer<typeof TagSchema>;
diff --git a/pkg/api/src/services/cron/service.ts b/pkg/api/src/services/cron/service.ts
index 4819cd2b..bb203a9b 100644
--- a/pkg/api/src/services/cron/service.ts
+++ b/pkg/api/src/services/cron/service.ts
@@ -12,7 +12,7 @@ import {
  * Represents a base class for a cron service.
  */
 export abstract class CronService {
-  private logger = Logger.getInstance().child({ label: 'services.cron' });
+  private logger = Logger.getInstance().child({ module: 'services.cron' });
 
   constructor(private activeJobs: JobCronName[]) {}
 
diff --git a/pkg/api/src/services/discovery/build.ts b/pkg/api/src/services/discovery/build.ts
index 0c403ddb..77c38bff 100644
--- a/pkg/api/src/services/discovery/build.ts
+++ b/pkg/api/src/services/discovery/build.ts
@@ -25,7 +25,7 @@ type ShowBuild = {
   actors: Record<string, number>;
 };
 
-const logger = loggerMain.child({ label: 'discovery.build' });
+const logger = loggerMain.child({ module: 'discovery.build' });
 
 export default async (id: string) => {
   try {
@@ -307,7 +307,7 @@ function buildCertification(certification: string, type: string) {
 
     default:
       logger.debug(`Unmapped Cert Rating - ${cert}`, {
-        label: 'discovery.build',
+        module: 'discovery.build',
       });
       return false;
   }
diff --git a/pkg/api/src/services/discovery/display.ts b/pkg/api/src/services/discovery/display.ts
index 4f0a0134..f80a6f27 100644
--- a/pkg/api/src/services/discovery/display.ts
+++ b/pkg/api/src/services/discovery/display.ts
@@ -26,7 +26,7 @@ import is from '@/utils/is';
 // eslint-disable-next-line import/order
 import cache from '../cache/cache';
 
-const logger = loggerMain.child({ label: 'discovery.display' });
+const logger = loggerMain.child({ module: 'discovery.display' });
 
 export type DiscoveryResult = {
   popular: {
@@ -559,7 +559,7 @@ function genreID(genreName: any, type: string) {
 
       default:
         logger.debug(`DISC: Genre not mapped ${genreName}`, {
-          label: 'discovery.build',
+          module: 'discovery.build',
         });
         return false;
     }
@@ -613,7 +613,7 @@ function genreID(genreName: any, type: string) {
         return 37;
       default:
         logger.debug(`DISC: Genre not mapped ${genreName}`, {
-          label: 'discovery.build',
+          module: 'discovery.build',
         });
         return false;
     }
diff --git a/pkg/api/src/services/discovery/index.ts b/pkg/api/src/services/discovery/index.ts
index f752afa3..bc5e11ca 100644
--- a/pkg/api/src/services/discovery/index.ts
+++ b/pkg/api/src/services/discovery/index.ts
@@ -9,7 +9,7 @@ import cache from '../cache/cache';
 import build from './build';
 import display from './display';
 
-const logger = loggerMain.child({ label: 'services.discovery' });
+const logger = loggerMain.child({ module: 'services.discovery' });
 
 export default async () => {
   logger.debug('started building discovery profiles');
diff --git a/pkg/api/src/services/downloaders/radarr.ts b/pkg/api/src/services/downloaders/radarr.ts
index cfa8eaec..e43d6b35 100644
--- a/pkg/api/src/services/downloaders/radarr.ts
+++ b/pkg/api/src/services/downloaders/radarr.ts
@@ -9,7 +9,7 @@ import {
 } from '@/models/downloaders';
 import Request from '@/models/request';
 
-const logger = loggerMain.child({ label: 'downloaders.radarr' });
+const logger = loggerMain.child({ module: 'downloaders.radarr' });
 
 export default class Radarr {
   instance: IDownloader;
diff --git a/pkg/api/src/services/downloaders/sonarr.ts b/pkg/api/src/services/downloaders/sonarr.ts
index d512d2b2..60ed5bd3 100644
--- a/pkg/api/src/services/downloaders/sonarr.ts
+++ b/pkg/api/src/services/downloaders/sonarr.ts
@@ -9,7 +9,7 @@ import {
 } from '@/models/downloaders';
 import Request from '@/models/request';
 
-const logger = loggerMain.child({ label: 'downloaders.sonarr' });
+const logger = loggerMain.child({ module: 'downloaders.sonarr' });
 
 export default class Sonarr {
   instance: IDownloader;
diff --git a/pkg/api/src/services/fanart/index.ts b/pkg/api/src/services/fanart/index.ts
index 48789dfe..f22b8bb4 100644
--- a/pkg/api/src/services/fanart/index.ts
+++ b/pkg/api/src/services/fanart/index.ts
@@ -3,7 +3,7 @@ import loggerMain from '@/loaders/logger';
 
 import cache from '../cache/cache';
 
-const logger = loggerMain.child({ label: 'fanart.index' });
+const logger = loggerMain.child({ module: 'fanart.index' });
 
 export default async (id: string, type: any) => {
   let data: any = {};
diff --git a/pkg/api/src/services/mail/mailer.ts b/pkg/api/src/services/mail/mailer.ts
index 1fa7fed2..92fb673a 100644
--- a/pkg/api/src/services/mail/mailer.ts
+++ b/pkg/api/src/services/mail/mailer.ts
@@ -3,7 +3,7 @@ import nodemailer from 'nodemailer';
 import { config } from '@/config/index';
 import loggerMain from '@/loaders/logger';
 
-const logger = loggerMain.child({ label: 'mail.mailer' });
+const logger = loggerMain.child({ module: 'mail.mailer' });
 
 export default class Mailer {
   transport: any;
diff --git a/pkg/api/src/services/meta/imdb.ts b/pkg/api/src/services/meta/imdb.ts
index 7a09bb40..fb1affd1 100644
--- a/pkg/api/src/services/meta/imdb.ts
+++ b/pkg/api/src/services/meta/imdb.ts
@@ -8,7 +8,7 @@ import pathsConfig from '@/config/env/paths';
 import loggerMain from '@/loaders/logger';
 import Imdb from '@/models/imdb';
 
-const logger = loggerMain.child({ label: 'meta.imdb' });
+const logger = loggerMain.child({ module: 'meta.imdb' });
 
 export async function lookup(imdb_id) {
   if (!imdb_id) {
@@ -36,7 +36,7 @@ export async function storeCache(firstTime = false) {
   logger.debug('IMDB: Rebuilding Cache');
   try {
     logger.debug('IMDB: Cache Downloading latest cache', {
-      label: 'meta.imdb',
+      module: 'meta.imdb',
     });
     const res = await axios({
       url: 'https://datasets.imdbws.com/title.ratings.tsv.gz',
diff --git a/pkg/api/src/services/notifications/discord.ts b/pkg/api/src/services/notifications/discord.ts
index 1710fc71..73a009f3 100644
--- a/pkg/api/src/services/notifications/discord.ts
+++ b/pkg/api/src/services/notifications/discord.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
 import { config } from '@/config/index';
 import loggerMain from '@/loaders/logger';
 
-const logger = loggerMain.child({ label: 'notifications.discord' });
+const logger = loggerMain.child({ module: 'notifications.discord' });
 
 export default class Discord {
   webhook: any;
diff --git a/pkg/api/src/services/notifications/notification.ts b/pkg/api/src/services/notifications/notification.ts
index 086b0ca5..597e633d 100644
--- a/pkg/api/src/services/notifications/notification.ts
+++ b/pkg/api/src/services/notifications/notification.ts
@@ -35,7 +35,7 @@ export const getNotificationProvider = (
 export class BaseNotification<T extends INotification> {
   protected config: T;
 
-  public logger = logger.child({ label: 'notification.service' });
+  public logger = logger.child({ module: 'notification.service' });
 
   constructor(config: T) {
     this.config = config;
diff --git a/pkg/api/src/services/notifications/telegram.ts b/pkg/api/src/services/notifications/telegram.ts
index 43084426..7f7f80c8 100644
--- a/pkg/api/src/services/notifications/telegram.ts
+++ b/pkg/api/src/services/notifications/telegram.ts
@@ -33,7 +33,7 @@ export default class Telegram {
   async test() {
     if (!this.check()) {
       logger.debug('Telegram: Chat id or bot token missing', {
-        label: 'notifications.telegram',
+        module: 'notifications.telegram',
       });
       return {
         result: false,
@@ -41,14 +41,14 @@ export default class Telegram {
       };
     }
     logger.debug('Telegram: Sending test message', {
-      label: 'notifications.telegram',
+      module: 'notifications.telegram',
     });
     const defaultText: any = 'Petio Test';
     const text = this.buildText(defaultText);
     const test = await this.postMessage(text);
     if (!test) {
       logger.debug('Telegram: Test Failed', {
-        label: 'notifications.telegram',
+        module: 'notifications.telegram',
       });
       return {
         result: false,
@@ -56,7 +56,7 @@ export default class Telegram {
       };
     }
     logger.debug('Telegram: Test passed', {
-      label: 'notifications.telegram',
+      module: 'notifications.telegram',
     });
     return {
       result: true,
@@ -67,7 +67,7 @@ export default class Telegram {
   send(title = null, content = null, username = null, image = null) {
     if (!this.check()) {
       logger.debug('Telegram: No config defined', {
-        label: 'notifications.telegram',
+        module: 'notifications.telegram',
       });
       return {
         result: false,
@@ -75,7 +75,7 @@ export default class Telegram {
       };
     }
     logger.debug(`Telegram: Sending message - ${content}`, {
-      label: 'notifications.telegram',
+      module: 'notifications.telegram',
     });
     const text = this.buildText(null, {
       title,
@@ -103,12 +103,12 @@ export default class Telegram {
         },
       );
       logger.debug('Telegram: message sent', {
-        label: 'notifications.telegram',
+        module: 'notifications.telegram',
       });
       return true;
     } catch (err) {
       logger.debug('Telegram: Failed to send message', {
-        label: 'notifications.telegram',
+        module: 'notifications.telegram',
       });
       return false;
     }
diff --git a/pkg/api/src/services/plex/bandwidth.ts b/pkg/api/src/services/plex/bandwidth.ts
index e714400e..72d2fd37 100644
--- a/pkg/api/src/services/plex/bandwidth.ts
+++ b/pkg/api/src/services/plex/bandwidth.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
 import loggerMain from '@/loaders/logger';
 import MakePlexURL from '@/services/plex/util';
 
-const logger = loggerMain.child({ label: 'plex.bandwidth' });
+const logger = loggerMain.child({ module: 'plex.bandwidth' });
 
 function timeDifference(previous) {
   const now = new Date();
diff --git a/pkg/api/src/services/plex/history.ts b/pkg/api/src/services/plex/history.ts
index b7b25d2d..049f0e3c 100644
--- a/pkg/api/src/services/plex/history.ts
+++ b/pkg/api/src/services/plex/history.ts
@@ -12,7 +12,7 @@ import { showLookup } from '@/services/tmdb/show';
 
 import cache from '../cache/cache';
 
-const logger = loggerMain.child({ label: 'plex.history' });
+const logger = loggerMain.child({ module: 'plex.history' });
 
 export default async (id, type) => {
   let data: any = false;
diff --git a/pkg/api/src/services/plex/library.ts b/pkg/api/src/services/plex/library.ts
index 59a30d39..7ac0072d 100644
--- a/pkg/api/src/services/plex/library.ts
+++ b/pkg/api/src/services/plex/library.ts
@@ -17,7 +17,7 @@ import Telegram from '@/services/notifications/telegram';
 import ProcessRequest from '@/services/requests/process';
 import { showLookup } from '@/services/tmdb/show';
 
-const logger = loggerMain.child({ label: 'plex.library' });
+const logger = loggerMain.child({ module: 'plex.library' });
 
 export default class LibraryUpdate {
   full: any;
@@ -260,7 +260,7 @@ export default class LibraryUpdate {
         const libContent = await this.getLibrary(lib.key);
         if (!libContent || !libContent.Metadata) {
           logger.warn(`CRON: No content in library skipping - ${lib.title}`, {
-            label: 'plex.library',
+            module: 'plex.library',
           });
           return;
         }
diff --git a/pkg/api/src/services/plex/top.ts b/pkg/api/src/services/plex/top.ts
index 81ee07a5..8b6d8626 100644
--- a/pkg/api/src/services/plex/top.ts
+++ b/pkg/api/src/services/plex/top.ts
@@ -13,7 +13,7 @@ import is from '@/utils/is';
 // eslint-disable-next-line import/order
 import cache from '../cache/cache';
 
-const logger = loggerMain.child({ label: 'plex.top' });
+const logger = loggerMain.child({ module: 'plex.top' });
 export default async (type: 1 | 2) => {
   try {
     return await cache.wrap(`popular__${type}`, async () => getTopData(type));
diff --git a/pkg/api/src/services/requests/filter.ts b/pkg/api/src/services/requests/filter.ts
index 225cc038..ded708b6 100644
--- a/pkg/api/src/services/requests/filter.ts
+++ b/pkg/api/src/services/requests/filter.ts
@@ -56,7 +56,7 @@ export default async (item) => {
       (optionalMatch > 0 || f.rows.length === 1)
     ) {
       logger.info(`FILT: Match on filter ${i + 1}`, {
-        label: 'requests.filter',
+        module: 'requests.filter',
       });
       action = f.action;
     }
diff --git a/pkg/api/src/services/requests/process.ts b/pkg/api/src/services/requests/process.ts
index 4d5906f0..af9fdd9e 100644
--- a/pkg/api/src/services/requests/process.ts
+++ b/pkg/api/src/services/requests/process.ts
@@ -12,7 +12,7 @@ import Telegram from '@/services/notifications/telegram';
 import filter from '@/services/requests/filter';
 import { showLookup } from '@/services/tmdb/show';
 
-const logger = loggerMain.child({ label: 'requests.process' });
+const logger = loggerMain.child({ module: 'requests.process' });
 
 export default class ProcessRequest {
   request: any;
diff --git a/pkg/api/src/services/tmdb/movie.ts b/pkg/api/src/services/tmdb/movie.ts
index 083499c4..4c16cd39 100644
--- a/pkg/api/src/services/tmdb/movie.ts
+++ b/pkg/api/src/services/tmdb/movie.ts
@@ -13,7 +13,7 @@ import cache from '../cache/cache';
 
 const agent = new http.Agent({ family: 4 });
 
-const logger = loggerMain.child({ label: 'tmdb.movie' });
+const logger = loggerMain.child({ module: 'tmdb.movie' });
 
 export async function movieLookup(id, minified = false) {
   logger.debug(`TMDB Movie Lookup ${id}`);
diff --git a/pkg/api/src/services/tmdb/person.ts b/pkg/api/src/services/tmdb/person.ts
index c0a2c2ea..bcec4de8 100644
--- a/pkg/api/src/services/tmdb/person.ts
+++ b/pkg/api/src/services/tmdb/person.ts
@@ -8,7 +8,7 @@ const agent = new http.Agent({ family: 4 });
 
 async function personLookup(id) {
   logger.debug(`TMDB Person Lookup ${id}`, {
-    label: 'tmdb.person',
+    module: 'tmdb.person',
   });
   const info = await getPersonInfo(id);
   const movies = await getPersonMovies(id);
diff --git a/pkg/api/src/services/tmdb/search.ts b/pkg/api/src/services/tmdb/search.ts
index ab431bf0..0d606980 100644
--- a/pkg/api/src/services/tmdb/search.ts
+++ b/pkg/api/src/services/tmdb/search.ts
@@ -12,7 +12,7 @@ import { showLookup } from '@/services/tmdb/show';
 
 const agent = new http.Agent({ family: 4 });
 
-const logger = loggerMain.child({ label: 'tmdb.search' });
+const logger = loggerMain.child({ module: 'tmdb.search' });
 
 async function search(term) {
   logger.debug(`TMDB Search ${term}`);
diff --git a/pkg/api/src/services/tmdb/show.ts b/pkg/api/src/services/tmdb/show.ts
index 9e730884..42fa3acb 100644
--- a/pkg/api/src/services/tmdb/show.ts
+++ b/pkg/api/src/services/tmdb/show.ts
@@ -16,7 +16,7 @@ import cache from '../cache/cache';
 
 const agent = new http.Agent({ family: 4 });
 
-const logger = loggerMain.child({ label: 'tmdb.show' });
+const logger = loggerMain.child({ module: 'tmdb.show' });
 
 export async function showLookup(id, minified = false) {
   if (!id || id === 'false') {
diff --git a/pkg/api/src/services/tmdb/trending.ts b/pkg/api/src/services/tmdb/trending.ts
index b2a20b2d..2c6c123b 100644
--- a/pkg/api/src/services/tmdb/trending.ts
+++ b/pkg/api/src/services/tmdb/trending.ts
@@ -191,7 +191,7 @@ async function getShows() {
 
 async function personData(): Promise<TrendingPeople[]> {
   logger.debug('Person from source not cache', {
-    label: 'tmdb.trending',
+    module: 'tmdb.trending',
   });
   const data = await TMDBAPI.get('/trending/:media_type/:time_window', {
     params: {
@@ -204,7 +204,7 @@ async function personData(): Promise<TrendingPeople[]> {
 
 async function moviesData(): Promise<TrendingMovie[]> {
   logger.debug('Movies from source not cache', {
-    label: 'tmdb.trending',
+    module: 'tmdb.trending',
   });
   const data = await TMDBAPI.get('/trending/:media_type/:time_window', {
     params: {
@@ -217,7 +217,7 @@ async function moviesData(): Promise<TrendingMovie[]> {
 
 async function showsData(): Promise<TrendingTv[]> {
   logger.debug('Shows from source not cache', {
-    label: 'tmdb.trending',
+    module: 'tmdb.trending',
   });
   const data = await TMDBAPI.get('/trending/:media_type/:time_window', {
     params: {