diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 91fb1c997a..102947fc58 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -34,7 +34,7 @@ services:
     container_name: postiz-pg-admin
     restart: always
     ports:
-      - 8081:80
+      - 8082:80
     environment:
       PGADMIN_DEFAULT_EMAIL: admin@admin.com
       PGADMIN_DEFAULT_PASSWORD: admin
@@ -133,7 +133,7 @@ services:
     networks:
       - temporal-network
     ports:
-      - "8080:8080"
+      - "8083:8080"
 
 volumes:
   redisinsight:
diff --git a/libraries/nestjs-libraries/src/sentry/initialize.sentry.ts b/libraries/nestjs-libraries/src/sentry/initialize.sentry.ts
index b92c6627bb..ebe909843d 100644
--- a/libraries/nestjs-libraries/src/sentry/initialize.sentry.ts
+++ b/libraries/nestjs-libraries/src/sentry/initialize.sentry.ts
@@ -34,6 +34,14 @@ export const initializeSentry = (appName: string, allowLogs = false) => {
       ],
       tracesSampleRate: 1.0,
       enableLogs: true,
+      beforeSendLog: (log: any) => {
+        log.attributes = { ...(log.attributes || {}), service: appName, component: 'nestjs' };
+        return log;
+      },
+      beforeSend(event: any) {
+        event.tags = { ...(event.tags || {}), service: appName, component: 'nestjs' };
+        return event;
+      },
 
       // Profiling
       profileSessionSampleRate: process.env.NODE_ENV === 'development' ? 1.0 : 0.45,
diff --git a/libraries/react-shared-libraries/src/sentry/initialize.sentry.next.basic.ts b/libraries/react-shared-libraries/src/sentry/initialize.sentry.next.basic.ts
index ef267949c7..f44f3661c4 100644
--- a/libraries/react-shared-libraries/src/sentry/initialize.sentry.next.basic.ts
+++ b/libraries/react-shared-libraries/src/sentry/initialize.sentry.next.basic.ts
@@ -40,7 +40,9 @@ export const initializeSentryBasic = (environment: string, dsn: string, extensio
       debug: environment === 'development',
       tracesSampleRate: 1.0,
 
-      beforeSend(event, hint) {
+      beforeSend(event: any, hint: any) {
+        event.tags = { ...(event.tags || {}), service: 'frontend', component: 'nextjs' };
+
         if (event.exception && event.exception.values) {
           for (const exception of event.exception.values) {
             if (exception.value) {
@@ -77,6 +79,12 @@ export const initializeSentryBasic = (environment: string, dsn: string, extensio
 
         return event; // Send the event to Sentry
       },
+
+      beforeSendLog: (log: any) => {
+        log.attributes = { ...(log.attributes || {}), service: 'frontend', component: 'nextjs' };
+        return log;
+      },
+
     });
   } catch (err) {
     // Log initialization errors