diff --git a/dashboard/src/components/Layout.css b/dashboard/src/components/Layout.css
index 0db1288..c5f6863 100644
--- a/dashboard/src/components/Layout.css
+++ b/dashboard/src/components/Layout.css
@@ -195,6 +195,100 @@
   color: var(--text-primary);
 }
 
+.language-select-wrapper {
+  position: relative;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  padding: 0.6rem 0.9rem;
+  color: var(--text-secondary);
+  background: none;
+  border: 1px solid var(--border);
+  border-radius: var(--radius);
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.language-select-wrapper:hover {
+  background: var(--bg-light);
+  color: var(--text-primary);
+}
+
+.language-icon {
+  flex-shrink: 0;
+  pointer-events: none;
+  z-index: 1;
+}
+
+.language-select {
+  width: 100%;
+  border: none;
+  background: transparent;
+  color: inherit;
+  font-family: inherit;
+  font-size: inherit;
+  font-weight: inherit;
+  cursor: pointer;
+  outline: none;
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  padding-right: 1.2rem;
+  padding-left: 0;
+  z-index: 2;
+}
+
+.language-select option {
+  background: var(--bg-white);
+  color: var(--text-primary);
+}
+
+.language-arrow {
+  position: absolute;
+  right: 0.9rem;
+  font-size: 0.6rem;
+  color: var(--text-muted);
+  pointer-events: none;
+  transition: transform 0.2s;
+  z-index: 1;
+}
+
+/* RTL styles */
+[dir="rtl"] .language-select {
+  padding-right: 0;
+  padding-left: 1.2rem;
+}
+
+[dir="rtl"] .language-arrow {
+  right: auto;
+  left: 0.9rem;
+}
+
+/* Collapsed sidebar styles */
+.sidebar.collapsed .language-select-wrapper {
+  justify-content: center;
+  padding: 0.6rem;
+  width: auto;
+  overflow: visible;
+}
+
+.sidebar.collapsed .language-select {
+  position: absolute;
+  inset: 0;
+  opacity: 0;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+
+.sidebar.collapsed .language-arrow {
+  display: none;
+}
+
 .logout-btn {
   display: flex;
   align-items: center;
diff --git a/dashboard/src/components/Layout.tsx b/dashboard/src/components/Layout.tsx
index f2815bb..3c34a68 100644
--- a/dashboard/src/components/Layout.tsx
+++ b/dashboard/src/components/Layout.tsx
@@ -22,7 +22,7 @@ import {
 } from 'lucide-react';
 import { useTheme } from '../hooks/useTheme';
 import { type UserRole } from '../hooks/useRole';
-import { supportedLanguages, type SupportedLanguage } from '../i18n';
+import { type SupportedLanguage } from '../i18n';
 import './Layout.css';
 
 interface LayoutProps {
@@ -80,12 +80,9 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
   const toggleMobile = () => setIsMobileOpen(!isMobileOpen);
 
   const currentLang = (i18n.resolvedLanguage || i18n.language || 'en').split('-')[0] as SupportedLanguage;
-  const cycleLanguage = () => {
-    const idx = supportedLanguages.indexOf(currentLang);
-    const next = supportedLanguages[(idx + 1) % supportedLanguages.length];
-    void i18n.changeLanguage(next);
+  const handleLanguageChange = (lang: string) => {
+    void i18n.changeLanguage(lang);
   };
-  const languageLabel = currentLang === 'he' ? 'עברית' : 'EN';
   const isRtl = currentLang === 'he';
 
   return (
@@ -151,15 +148,20 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
         </nav>
 
         <div className="sidebar-footer">
-          <button
-            className="theme-toggle-btn"
-            onClick={cycleLanguage}
-            title={t('common.language')}
-            aria-label={t('common.language')}
-          >
-            <Languages size={18} />
-            {!isCollapsed && <span>{languageLabel}</span>}
-          </button>
+          <div className="language-select-wrapper" title={t('common.language')}>
+            <Languages size={18} className="language-icon" />
+            <select
+              value={currentLang}
+              onChange={(e) => handleLanguageChange(e.target.value)}
+              className="language-select"
+              aria-label={t('common.language')}
+            >
+              <option value="en">English</option>
+              <option value="es">Español</option>
+              <option value="he">עברית</option>
+            </select>
+            {!isCollapsed && <span className="language-arrow">▼</span>}
+          </div>
           <button
             className="theme-toggle-btn"
             onClick={toggleTheme}
diff --git a/dashboard/src/i18n/index.ts b/dashboard/src/i18n/index.ts
index cfa5b8c..a29a641 100644
--- a/dashboard/src/i18n/index.ts
+++ b/dashboard/src/i18n/index.ts
@@ -3,8 +3,9 @@ import { initReactI18next } from 'react-i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import en from './locales/en.json';
 import he from './locales/he.json';
+import es from './locales/es.json';
 
-export const supportedLanguages = ['en', 'he'] as const;
+export const supportedLanguages = ['en', 'he', 'es'] as const;
 export type SupportedLanguage = (typeof supportedLanguages)[number];
 
 export const rtlLanguages: SupportedLanguage[] = ['he'];
@@ -16,6 +17,7 @@ void i18n
     resources: {
       en: { translation: en },
       he: { translation: he },
+      es: { translation: es },
     },
     fallbackLng: 'en',
     supportedLngs: supportedLanguages as unknown as string[],
diff --git a/dashboard/src/i18n/locales/es.json b/dashboard/src/i18n/locales/es.json
new file mode 100644
index 0000000..2b02212
--- /dev/null
+++ b/dashboard/src/i18n/locales/es.json
@@ -0,0 +1,513 @@
+{
+  "common": {
+    "appName": "OpenWA",
+    "appSubtitle": "API de WhatsApp",
+    "loading": "Cargando...",
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "delete": "Eliminar",
+    "edit": "Editar",
+    "create": "Crear",
+    "close": "Cerrar",
+    "submit": "Enviar",
+    "confirm": "Confirmar",
+    "search": "Buscar",
+    "filter": "Filtrar",
+    "actions": "Acciones",
+    "status": "Estado",
+    "name": "Nombre",
+    "role": "Rol",
+    "type": "Tipo",
+    "url": "URL",
+    "port": "Puerto",
+    "host": "Host",
+    "username": "Usuario",
+    "password": "Contraseña",
+    "active": "Activo",
+    "inactive": "Inactivo",
+    "enabled": "Habilitado",
+    "disabled": "Deshabilitado",
+    "connected": "Conectado",
+    "disconnected": "Desconectado",
+    "never": "Nunca",
+    "justNow": "Hace un momento",
+    "minAgo": "Hace {{count}} min",
+    "hoursAgo": "Hace {{count}} horas",
+    "optional": "opcional",
+    "language": "Idioma",
+    "english": "Inglés",
+    "hebrew": "Hebreo",
+    "spanish": "Español",
+    "back": "Atrás",
+    "next": "Siguiente",
+    "previous": "Anterior",
+    "expand": "Expandir",
+    "collapse": "Colapsar",
+    "logout": "Cerrar sesión",
+    "refresh": "Actualizar",
+    "errorGeneric": "Ha ocurrido un error",
+    "unknownError": "Error desconocido"
+  },
+  "theme": {
+    "light": "Claro",
+    "dark": "Oscuro",
+    "system": "Sistema",
+    "label": "Tema: {{value}}"
+  },
+  "nav": {
+    "dashboard": "Panel de Control",
+    "sessions": "Sesiones",
+    "webhooks": "Webhooks",
+    "apiKeys": "Claves de API",
+    "messageTester": "Probador de Mensajes",
+    "infrastructure": "Infraestructura",
+    "plugins": "Plugins",
+    "logs": "Registros de Auditoría"
+  },
+  "errorBoundary": {
+    "title": "Algo salió mal",
+    "description": "El panel de control encontró un error inesperado.",
+    "reload": "Recargar Panel"
+  },
+  "login": {
+    "apiKey": "Clave de API",
+    "apiKeyPlaceholder": "Introduce tu clave de API",
+    "apiKeyRequired": "La clave de API es obligatoria",
+    "connect": "Conectar",
+    "connecting": "Conectando...",
+    "invalidKey": "Clave de API inválida",
+    "connectionError": "No se pudo conectar al servidor. Inténtalo de nuevo.",
+    "help": "¿Necesitas ayuda?",
+    "viewDocs": "Ver Documentación",
+    "footer": "Hecho con ❤️ por Yudhi Armyndharis y la Comunidad de OpenWA",
+    "version": "v{{version}} · {{date}}"
+  },
+  "dashboard": {
+    "title": "Panel de Control",
+    "subtitle": "Resumen de tus sesiones de WhatsApp y actividad",
+    "stats": {
+      "activeSessions": "Sesiones Activas",
+      "messagesToday": "Mensajes Hoy",
+      "webhooksConfigured": "Webhooks Configurados",
+      "apiCalls": "Llamadas de API (24h)"
+    },
+    "sessionsOverview": "Resumen de Sesiones",
+    "showingSessions": "Mostrando {{shown}} de {{total}} sesiones",
+    "columns": {
+      "sessionId": "ID de Sesión",
+      "phone": "Número de Teléfono",
+      "status": "Estado",
+      "lastActive": "Última Actividad",
+      "actions": "Acciones"
+    },
+    "noSessions": "No se encontraron sesiones. Crea una para comenzar.",
+    "view": "Ver",
+    "disconnect": "Desconectar",
+    "errorPrefix": "Error: {{message}}",
+    "loadError": "Error al cargar datos"
+  },
+  "sessionStatus": {
+    "created": "Nuevo",
+    "idle": "Inactivo",
+    "initializing": "Iniciando...",
+    "connecting": "Conectando...",
+    "qr_ready": "Escanear QR",
+    "ready": "Conectado",
+    "disconnected": "Desconectado"
+  },
+  "sessions": {
+    "title": "Sesiones",
+    "subtitle": "Administra tus sesiones de WhatsApp y conexiones de códigos QR",
+    "newSession": "Nueva Sesión",
+    "searchPlaceholder": "Buscar sesiones...",
+    "filter": {
+      "all": "Todos los estados",
+      "active": "Activas (Conectadas)",
+      "inactive": "Inactivas",
+      "connecting": "Conectando"
+    },
+    "empty": {
+      "title": "No se encontraron sesiones",
+      "description": "Crea una nueva sesión para comenzar"
+    },
+    "create": {
+      "title": "Crear Nueva Sesión",
+      "label": "Nombre de la Sesión",
+      "placeholder": "ej. bot-marketing",
+      "hint": "Usa solo letras minúsculas, números y guiones. Ejemplo: <code>soporte-cliente</code>, <code>bot-1</code>",
+      "invalidChars": "Caracteres inválidos. Solo se permiten letras minúsculas, números y guiones.",
+      "tooLong": "El nombre debe tener 50 caracteres o menos ({{length}}/50).",
+      "duplicate": "Ya existe una sesión con este nombre.",
+      "successTitle": "Sesión Creada",
+      "successDesc": "Sesión \"{{name}}\" creada exitosamente",
+      "errorTitle": "Error al Crear",
+      "errorDefault": "No se pudo crear la sesión"
+    },
+    "delete": {
+      "title": "Confirmar Eliminación",
+      "message": "¿Estás seguro de que deseas eliminar la sesión <strong>\"{{name}}\"</strong>?",
+      "warning": "Esta acción no se puede deshacer.",
+      "successTitle": "Sesión Eliminada",
+      "successDescNamed": "Sesión \"{{name}}\" eliminada",
+      "successDescGeneric": "Sesión eliminada",
+      "errorTitle": "Error al Eliminar",
+      "errorDefault": "No se pudo eliminar la sesión"
+    },
+    "qr": {
+      "title": "Escanear Código QR",
+      "step1": "<strong>1.</strong> Abre WhatsApp en tu teléfono",
+      "step2": "<strong>2.</strong> Toca <strong>Menú</strong> o <strong>Configuración</strong> → <strong>Dispositivos vinculados</strong>",
+      "step3": "<strong>3.</strong> Toca <strong>Vincular un dispositivo</strong> y escanea este código QR",
+      "autoRefresh": "El QR se actualiza automáticamente cada 5 segundos",
+      "generating": "Generando código QR...",
+      "unavailable": "El código QR no está disponible todavía. Inténtalo de nuevo en un momento.",
+      "preparing": "Preparando código QR...",
+      "showQr": "Mostrar QR",
+      "loading": "Cargando...",
+      "scanToConnect": "Escanea el código QR para conectar"
+    },
+    "details": {
+      "title": "Detalles de la Sesión",
+      "name": "Nombre",
+      "status": "Estado",
+      "sessionId": "ID de Sesión",
+      "phone": "Número de Teléfono",
+      "phoneNone": "No conectado",
+      "created": "Creado",
+      "lastActive": "Última Actividad"
+    },
+    "actions": {
+      "view": "Ver",
+      "start": "Iniciar",
+      "stop": "Detener",
+      "reconnect": "Reconectar",
+      "delete": "Eliminar"
+    },
+    "toasts": {
+      "readyTitle": "Sesión Lista",
+      "readyDesc": "La sesión de WhatsApp está conectada",
+      "disconnectedTitle": "Sesión Desconectada",
+      "disconnectedDesc": "La sesión de WhatsApp se ha desconectado"
+    },
+    "card": {
+      "phone": "Teléfono",
+      "sessionId": "ID de Sesión",
+      "lastActive": "Último Uso"
+    }
+  },
+  "webhooks": {
+    "title": "Webhooks",
+    "subtitle": "Configura devoluciones de llamada HTTP para notificaciones de eventos en tiempo real",
+    "addWebhook": "Agregar Webhook",
+    "createTitle": "Crear Webhook",
+    "editTitle": "Editar Webhook",
+    "deleteTitle": "Eliminar Webhook",
+    "deleteConfirm": "¿Estás seguro de que deseas eliminar este webhook?",
+    "selectSession": "Seleccionar sesión...",
+    "session": "Sesión",
+    "events": "Eventos",
+    "available": "Eventos Disponibles",
+    "saveChanges": "Guardar Cambios",
+    "columns": {
+      "url": "URL",
+      "events": "Eventos",
+      "session": "Sesión",
+      "status": "Estado",
+      "actions": "Acciones"
+    },
+    "empty": {
+      "title": "No hay webhooks configurados",
+      "description": "Agrega un webhook para recibir notificaciones de eventos en tiempo real"
+    },
+    "toasts": {
+      "created": "Webhook creado exitosamente",
+      "createFailed": "Error al crear webhook: {{message}}",
+      "deleted": "Webhook eliminado exitosamente",
+      "deleteFailed": "Error al eliminar webhook: {{message}}",
+      "updated": "Webhook actualizado exitosamente",
+      "updateFailed": "Error al actualizar webhook: {{message}}",
+      "testOk": "¡Prueba de webhook exitosa! Estado: {{status}}",
+      "testFailed": "Prueba de webhook fallida: {{message}}",
+      "testError": "Error al probar webhook: {{message}}"
+    },
+    "actions": {
+      "test": "Probar",
+      "edit": "Editar",
+      "delete": "Eliminar"
+    },
+    "eventDescriptions": {
+      "message.received": "Cuando se recibe un mensaje",
+      "message.sent": "Cuando se envía un mensaje",
+      "session.connected": "Cuando se conecta una sesión",
+      "session.disconnected": "Cuando se desconecta una sesión",
+      "session.qr": "Cuando se genera un código QR",
+      "all": "Todos los eventos"
+    }
+  },
+  "apiKeys": {
+    "title": "Claves de API",
+    "subtitle": "Administra las claves de API para autenticación y control de acceso",
+    "createBtn": "Crear Clave de API",
+    "modalTitle": "Crear Clave de API",
+    "createdTitle": "Clave de API Creada",
+    "createdHint": "Copia esta clave ahora. No podrás volver a verla de nuevo.",
+    "namePlaceholder": "ej. Clave de Producción",
+    "rolesTitle": "Referencia de Roles",
+    "roles": {
+      "admin": "Administrador",
+      "operator": "Operador",
+      "viewer": "Lector"
+    },
+    "roleDescriptions": {
+      "admin": "Acceso total a todos los recursos",
+      "operator": "Administración de sesiones y mensajes",
+      "viewer": "Acceso de solo lectura"
+    },
+    "columns": {
+      "name": "Nombre",
+      "key": "Clave",
+      "role": "Rol",
+      "status": "Estado",
+      "lastUsed": "Último Uso",
+      "actions": "Acciones"
+    },
+    "statuses": {
+      "active": "Activa",
+      "revoked": "Revocada"
+    },
+    "empty": {
+      "title": "No se han creado claves de API",
+      "description": "Crea una clave de API para autenticar tus solicitudes"
+    },
+    "confirm": {
+      "deleteTitle": "Eliminar Clave de API",
+      "revokeTitle": "Revocar Clave de API",
+      "deleteMessage": "¿Estás seguro de que deseas eliminar permanentemente la clave <strong>{{name}}</strong>? Esta acción no se puede deshacer.",
+      "revokeMessage": "¿Estás seguro de que deseas revocar la clave <strong>{{name}}</strong>? Dejará de funcionar.",
+      "delete": "Eliminar",
+      "revoke": "Revocar"
+    },
+    "actions": {
+      "copy": "Copiar",
+      "revoke": "Revocar",
+      "delete": "Eliminar"
+    }
+  },
+  "logs": {
+    "title": "Registros de Auditoría",
+    "subtitle": "Rastrea y revisa todas las acciones de la API y eventos del sistema",
+    "exportCsv": "Exportar CSV",
+    "searchPlaceholder": "Buscar registros...",
+    "severity": {
+      "all": "Todas las severidades",
+      "info": "Información",
+      "warn": "Advertencia",
+      "error": "Error"
+    },
+    "columns": {
+      "timestamp": "Marca de tiempo",
+      "action": "Acción",
+      "session": "Sesión",
+      "apiKey": "Clave de API",
+      "ip": "Dirección IP",
+      "severity": "Severidad"
+    },
+    "empty": {
+      "title": "No se encontraron registros",
+      "description": "Los registros de auditoría aparecerán aquí a medida que se realicen acciones"
+    }
+  },
+  "messageTester": {
+    "title": "Probador de Mensajes",
+    "subtitle": "Envía mensajes de prueba a través de la API",
+    "compose": "Enviar Mensaje de Prueba",
+    "responseTitle": "Respuesta de la API",
+    "session": "Sesión",
+    "noReadySessions": "No hay sesiones listas",
+    "sessionOptionPhoneNone": "Sin teléfono",
+    "recipientType": "Tipo de Destinatario",
+    "personal": "Personal",
+    "group": "Grupo",
+    "selectGroup": "Seleccionar Grupo",
+    "recipientPhone": "Número de Teléfono del Destinatario",
+    "loadingGroups": "Cargando grupos...",
+    "noGroupsFound": "No se encontraron grupos",
+    "selectGroupHint": "Selecciona un grupo de tu WhatsApp",
+    "phoneHint": "Usa formato internacional sin espacios",
+    "messageType": "Tipo de Mensaje",
+    "types": {
+      "text": "Texto",
+      "image": "Imagen",
+      "video": "Video",
+      "audio": "Audio",
+      "document": "Documento"
+    },
+    "messageContent": "Contenido del Mensaje",
+    "messagePlaceholder": "Escribe tu mensaje aquí...",
+    "mediaUrl": "URL del Archivo",
+    "caption": "Leyenda",
+    "filename": "Nombre del archivo",
+    "captionPlaceholder": "Escribe una leyenda...",
+    "filenamePlaceholder": "documento.pdf",
+    "send": "Enviar Mensaje",
+    "sending": "Enviando...",
+    "viewOnly": "Solo Vista",
+    "responseEmpty": "Envía un mensaje para ver la respuesta de la API",
+    "successLabel": "200 OK - Éxito",
+    "failedLabel": "400 - Fallido",
+    "response": {
+      "timestamp": "Marca de tiempo",
+      "messageId": "ID de Mensaje",
+      "error": "Error"
+    },
+    "sendFailed": "Error al enviar el mensaje"
+  },
+  "infrastructure": {
+    "title": "Infraestructura",
+    "subtitle": "Configura los ajustes del servidor, base de datos, caché, almacenamiento y motor",
+    "saveConfig": "Guardar Configuración",
+    "saving": "Guardando...",
+    "server": {
+      "title": "Configuración del Servidor",
+      "production": "Producción",
+      "development": "Desarrollo",
+      "environment": "Entorno",
+      "domain": "Dominio",
+      "apiPort": "Puerto de API",
+      "dashboardPort": "Puerto de Dashboard",
+      "corsOrigins": "Orígenes de CORS",
+      "corsPlaceholder": "* o valores separados por comas",
+      "publicApiUrl": "URL Pública de API (opcional)",
+      "publicDashboardUrl": "URL Pública de Dashboard (opcional)"
+    },
+    "webhook": {
+      "title": "Webhooks y Límites de Tasa",
+      "settings": "Ajustes de Webhooks",
+      "timeout": "Tiempo de espera (ms)",
+      "maxRetries": "Reintentos Máximos",
+      "retryDelay": "Retraso de reintento (ms)",
+      "rateLimit": "Límites de Tasa",
+      "window": "Ventana de tiempo (segundos)",
+      "maxReq": "Peticiones Máximas por Ventana"
+    },
+    "database": {
+      "title": "Configuración de Base de Datos",
+      "sqlite": "SQLite",
+      "sqliteDesc": "Base de datos local basada en archivos",
+      "postgres": "PostgreSQL",
+      "postgresDesc": "Base de datos lista para producción",
+      "useBuiltIn": "Usar contenedor integrado de PostgreSQL",
+      "builtInDesc": "OpenWA administrará un contenedor de PostgreSQL por ti",
+      "dbName": "Nombre de Base de Datos",
+      "poolSize": "Tamaño del Pool",
+      "ssl": "Conexión SSL",
+      "sslDesc": "Habilitar TLS/SSL para conexiones de bases de datos seguras",
+      "migrationsTitle": "Migraciones de Base de Datos",
+      "migrationsStatus": "El esquema se auto-sincroniza con TypeORM",
+      "migrationsHint": "Las migraciones se gestionan automáticamente. Usa CLI para migraciones manuales."
+    },
+    "redis": {
+      "title": "Redis",
+      "enable": "Habilitar Redis",
+      "enableDesc": "Requerido para caché, almacenamiento de sesiones y colas de BullMQ",
+      "useBuiltIn": "Usar contenedor integrado de Redis",
+      "builtInDesc": "OpenWA administrará un contenedor de Redis por ti",
+      "queueTitle": "Habilitar Sistema de Colas BullMQ",
+      "queueDesc": "Usa colas de mensajería para una entrega confiable de mensajes y webhooks",
+      "statsTitle": "Estadísticas de Colas",
+      "messageQueue": "Cola de Mensajes",
+      "webhookQueue": "Cola de Webhooks",
+      "pending": "Pendientes",
+      "completed": "Completados",
+      "failed": "Fallidos",
+      "clearFailed": "Limpiar trabajos fallidos",
+      "viewBullMq": "Ver Panel de BullMQ",
+      "disabledTitle": "Redis está Deshabilitado",
+      "disabledDesc": "Habilita Redis para caché, almacenamiento de sesiones y colas de mensajes de BullMQ.",
+      "passwordOptional": "(opcional)"
+    },
+    "storage": {
+      "title": "Configuración de Almacenamiento",
+      "local": "Sistema de archivos local",
+      "localDesc": "Almacenar archivos multimedia localmente",
+      "s3": "Amazon S3",
+      "s3Desc": "Almacenamiento en la nube (compatible con S3)",
+      "useBuiltIn": "Usar contenedor integrado de MinIO",
+      "builtInDesc": "OpenWA administrará un contenedor de MinIO (compatible con S3) por ti",
+      "storagePath": "Ruta de Almacenamiento",
+      "bucket": "Nombre del Bucket",
+      "region": "Región",
+      "accessKey": "Clave de Acceso",
+      "secretKey": "Clave Secreta",
+      "endpoint": "Endpoint Personalizado (opcional)",
+      "endpointHint": "Para MinIO u otros servicios compatibles con S3"
+    },
+    "statusLabels": {
+      "connected": "Conectado",
+      "disconnected": "Desconectado",
+      "disabled": "Deshabilitado"
+    },
+    "restart": {
+      "idleTitle": "⚙️ Configuración Guardada",
+      "restartingTitle": "🔄 Reiniciando Servidor...",
+      "waitingTitle": "⏳ Por Favor Espera...",
+      "successTitle": "✅ Servidor Listo",
+      "errorTitle": "❌ Fallo al Reiniciar",
+      "idleDesc": "La configuración se ha guardado en <code>.env.generated</code>.<br/>Se requiere reiniciar el servidor para aplicar los cambios.",
+      "later": "Reiniciar Después",
+      "now": "Reiniciar Ahora",
+      "restartingMsg": "Reiniciando servidor... {{count}}s",
+      "checking": "Comprobando estado del servidor...",
+      "dontClose": "Por favor no cierres esta ventana",
+      "successMsg": "¡El servidor vuelve a estar en línea! La página se recargará automáticamente.",
+      "errorMsg": "El servidor no respondió tras 30 segundos. Por favor, revisa los registros de Docker y reinicia manualmente.",
+      "reload": "Recargar Página"
+    },
+    "toasts": {
+      "saveFailed": "Fallo al Guardar"
+    }
+  },
+  "plugins": {
+    "title": "Plugins",
+    "subtitle": "Administra motores, backends de almacenamiento y extensiones",
+    "refresh": "Actualizar",
+    "engineCard": "Motor Activo de WhatsApp",
+    "running": "Ejecutándose",
+    "supportedFeatures": "Características Soportadas:",
+    "more": "+{{count}} más",
+    "builtIn": "Integrado",
+    "noDescription": "Sin descripción disponible",
+    "required": "Requerido",
+    "active": "Activo",
+    "activate": "Activar",
+    "enable": "Habilitar",
+    "disable": "Deshabilitar",
+    "healthCheck": "Comprobación de Salud",
+    "configure": "Configurar",
+    "empty": {
+      "title": "No se encontraron plugins",
+      "description": "Instala plugins para extender las funciones de OpenWA"
+    },
+    "config": {
+      "title": "Configurar {{name}}",
+      "restartNotice": "Los cambios requieren reiniciar el servidor para tener efecto",
+      "engineType": "Tipo de Motor",
+      "headless": "Modo Headless (Sin Interfaz)",
+      "headlessDesc": "Ejecutar navegador sin interfaz visible (recomendado para producción)",
+      "sessionDataPath": "Ruta de datos de sesión",
+      "browserArgs": "Argumentos del navegador",
+      "noOptions": "No hay opciones de configuración disponibles para este plugin",
+      "save": "Guardar Configuración"
+    },
+    "toasts": {
+      "errorTitle": "Error de Plugin",
+      "errorDefault": "Error al alternar el plugin",
+      "healthOk": "Comprobación de Salud Aprobada",
+      "healthFail": "Comprobación de Salud Fallida",
+      "healthError": "Error de Comprobación de Salud",
+      "savedTitle": "Configuración Guardada",
+      "savedDesc": "Se requiere reiniciar el servidor para aplicar cambios.",
+      "saveFailed": "Fallo al Guardar"
+    }
+  }
+}
diff --git a/package-lock.json b/package-lock.json
index f3f6b17..41d3f01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -745,7 +745,6 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -1251,7 +1250,6 @@
       "resolved": "https://registry.npmjs.org/@bull-board/api/-/api-7.1.5.tgz",
       "integrity": "sha512-EW0sbTtGIysu9vipdVpPQeToPqOpPgVZTt+pn1Ut3gbSS/GLWbEgIfFtMmSQDUoSL9WH00RzjgUY5K+43nWh0A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "redis-info": "^3.1.0"
       },
@@ -1290,7 +1288,6 @@
       "resolved": "https://registry.npmjs.org/@bull-board/ui/-/ui-7.1.5.tgz",
       "integrity": "sha512-2IkatKwNRx/1M9/lAZIptcxS1FPNq6icpp2M46Upwd4olVxs/ujF9Kvs+Ff9ExtIO/OgYfwx7mG2IprGZ+nQCg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@bull-board/api": "7.1.5"
       }
@@ -1580,7 +1577,6 @@
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
       "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@grpc/proto-loader": "^0.8.0",
         "@js-sdsl/ordered-map": "^4.4.2"
@@ -1612,7 +1608,6 @@
       "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
       "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "lodash.camelcase": "^4.3.0",
         "long": "^5.0.0",
@@ -2880,7 +2875,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-11.0.4.tgz",
       "integrity": "sha512-VBJcDHSAzxQnpcDfA0kt9MTGUD1XZzfByV70su0W0eDCQ9aqIEBlzWRW21tv9FG9dIut22ysgDidshdjlnczLw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "tslib": "2.8.1"
       },
@@ -2955,7 +2949,6 @@
       "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -3126,7 +3119,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.21.tgz",
       "integrity": "sha512-YV1HYDGsm2rnR0vrLKidtrG6jYX5yqiIjeur1j8++dKGqhhsJ6cjMs0RfQRSTUH7IjgDemA59/znQ8nRrE0D9g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "file-type": "21.3.4",
         "iterare": "1.2.1",
@@ -3174,7 +3166,6 @@
       "integrity": "sha512-fqo0BHgny3MOuAL8GSfG3ZUKFVVBaBQD/0iyibnwTONT5vPexjQxJzu+945iloVvBDmrnAaRWxC1gqCDEs/AXQ==",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@nuxt/opencollective": "0.4.1",
         "fast-safe-stringify": "2.1.1",
@@ -3235,7 +3226,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.21.tgz",
       "integrity": "sha512-lA3ViycOnz4Df3EstIKpuAVFhqxQixTnjAVk0M+LRyNBlGM6VSCaNJaAIrb9Pcry39T4hTHpNVbRqGLSvhL8gA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cors": "2.8.6",
         "express": "5.2.1",
@@ -3257,7 +3247,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.21.tgz",
       "integrity": "sha512-Tq5JgaVS+auD3DXuRBy8UMU3mf69HJO8Ep+BuRS9GYMXGd/5sdMHqIQvXlXkGih9tQXdeeG9WoqURe/+IjPKng==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "socket.io": "4.8.3",
         "tslib": "2.8.1"
@@ -3443,7 +3432,6 @@
       "resolved": "https://registry.npmjs.org/@nestjs/typeorm/-/typeorm-11.0.1.tgz",
       "integrity": "sha512-8rw/nKT0S+L+MkzgE9F2/mox7mAgsPlwfzmW9gsESN1lmQtIrVEfiiBwC2O8+guS1jBfQehJIdcdUj2OAp4VUQ==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "@nestjs/common": "^10.0.0 || ^11.0.0",
         "@nestjs/core": "^10.0.0 || ^11.0.0",
@@ -4040,7 +4028,6 @@
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4160,7 +4147,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.0.tgz",
       "integrity": "sha512-AOQwYUNolgy3VosiRqXrACUXTN8nJUtPl7FJXMqZVyxiiCLhQuG3jXKvCS1ALr+Y2OmZhzzLVlYPEqJaiqkaJQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": ">=7.24.0 <7.24.7"
       }
@@ -4382,7 +4368,6 @@
       "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.59.3",
         "@typescript-eslint/types": "8.59.3",
@@ -5096,7 +5081,6 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5186,7 +5170,6 @@
       "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5734,7 +5717,6 @@
       "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
       "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "peerDependencies": {
         "bare-abort-controller": "*"
       },
@@ -6037,7 +6019,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.10.12",
         "caniuse-lite": "^1.0.30001782",
@@ -6128,7 +6109,6 @@
       "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.76.10.tgz",
       "integrity": "sha512-LWve7SpQjYSpCP2GEsWmoyzTz2H37L8HRmSTu3YihYsTOr5kJxrfEX6aEV7m6eskEMWXSHZYTMZepX6qNaH6CQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cron-parser": "4.9.0",
         "ioredis": "5.10.1",
@@ -6455,15 +6435,13 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz",
       "integrity": "sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/class-validator": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.15.1.tgz",
       "integrity": "sha512-LqoS80HBBSCVhz/3KloUly0ovokxpdOLR++Al3J3+dHXWt9sTKlKd4eYtoxhxyUjoe5+UcIM+5k9MIxyBWnRTw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/validator": "^13.15.3",
         "libphonenumber-js": "^1.11.1",
@@ -7183,8 +7161,7 @@
       "version": "0.0.1581282",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1581282.tgz",
       "integrity": "sha512-nv7iKtNZQshSW2hKzYNr46nM/Cfh5SEvE2oV0/SEGgc9XupIY5ggf84Cz8eJIkBce7S3bmTAauFD6aysMpnqsQ==",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/dezalgo": {
       "version": "1.0.4",
@@ -7683,7 +7660,6 @@
       "integrity": "sha512-loXy6bWOoP3EP6JA7jo6p5jMpBJmHmsNZM5SFRHLdh1MGOPurMnNBj4ZlAbaqUAaQWbCr7jHV4P7gzAyryZWkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
@@ -7740,7 +7716,6 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -9202,7 +9177,6 @@
       "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.1.tgz",
       "integrity": "sha512-HuEDBTI70aYdx1v6U97SbNx9F1+svQKBDo30o0b9fw055LMepzpOOd0Ccg9Q6tbqmBSJaMuY0fB7yw9/vjBYCA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ioredis/commands": "1.5.1",
         "cluster-key-slot": "^1.1.0",
@@ -9487,7 +9461,6 @@
       "integrity": "sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/core": "30.4.2",
         "@jest/types": "30.4.1",
@@ -11413,6 +11386,7 @@
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 6"
       }
@@ -11792,7 +11766,6 @@
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.21.0.tgz",
       "integrity": "sha512-AUP1EYJuHraQGsVoCQVIcM7TEJVGtDzxWtGFZd8rds9d+CCXlU5Js1rYgfLNvxy9iJrpHjGrRjoi/3BT9fRyiA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "pg-connection-string": "^2.13.0",
         "pg-pool": "^3.14.0",
@@ -12085,7 +12058,6 @@
       "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -12774,8 +12746,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
@@ -12925,7 +12896,6 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
       "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -13452,7 +13422,6 @@
       "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "bindings": "^1.5.0",
         "node-addon-api": "^7.0.0",
@@ -13975,7 +13944,6 @@
       "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -14329,7 +14297,6 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -14514,7 +14481,6 @@
       "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.29.tgz",
       "integrity": "sha512-wwPEX/df4l72gCmOsrs0otJZYLGA9lLQkUZCkukbsymEycV4zXv2KM7wU7v2r8L01TaCgY9ApSSqHQWBOUhEoQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@sqltools/formatter": "^1.2.5",
         "ansis": "^4.2.0",
@@ -14734,7 +14700,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15153,6 +15118,7 @@
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -15171,6 +15137,7 @@
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -15184,6 +15151,7 @@
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -15198,6 +15166,7 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -15207,7 +15176,8 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "4.3.3",
@@ -15215,6 +15185,7 @@
       "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
diff --git a/package.json b/package.json
index ec1de08..2ee4cb4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "dashboard:install": "cd dashboard && npm install",
     "dashboard:dev": "cd dashboard && npm run dev",
     "dashboard:build": "cd dashboard && npm run build",
-    "postinstall": "[ -d dashboard ] && npm run dashboard:install || true",
+    "postinstall": "node -e \"if (require('fs').existsSync('dashboard')) { require('child_process').execSync('npm run dashboard:install', { stdio: 'inherit' }); }\"",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:watch": "jest --watch",
diff --git a/src/database/data-source.ts b/src/database/data-source.ts
index b1715a5..9cca160 100644
--- a/src/database/data-source.ts
+++ b/src/database/data-source.ts
@@ -10,7 +10,11 @@ const dbType = process.env.DATABASE_TYPE || 'sqlite';
 const sqliteDataSource = new DataSource({
   type: 'sqlite',
   database: process.env.DATABASE_NAME || './data/openwa.sqlite',
-  entities: [__dirname + '/../**/*.entity{.ts,.js}'],
+  entities: [
+    __dirname + '/../modules/session/**/*.entity{.ts,.js}',
+    __dirname + '/../modules/webhook/**/*.entity{.ts,.js}',
+    __dirname + '/../modules/message/**/*.entity{.ts,.js}',
+  ],
   migrations: [__dirname + '/migrations/*{.ts,.js}'],
   synchronize: false,
   logging: process.env.DATABASE_LOGGING === 'true',
@@ -24,7 +28,11 @@ const postgresDataSource = new DataSource({
   username: process.env.DATABASE_USERNAME,
   password: process.env.DATABASE_PASSWORD,
   database: process.env.DATABASE_NAME || 'openwa',
-  entities: [__dirname + '/../**/*.entity{.ts,.js}'],
+  entities: [
+    __dirname + '/../modules/session/**/*.entity{.ts,.js}',
+    __dirname + '/../modules/webhook/**/*.entity{.ts,.js}',
+    __dirname + '/../modules/message/**/*.entity{.ts,.js}',
+  ],
   migrations: [__dirname + '/migrations/*{.ts,.js}'],
   synchronize: false, // Never auto-sync in production
   logging: process.env.DATABASE_LOGGING === 'true',
@@ -41,3 +49,4 @@ const postgresDataSource = new DataSource({
 
 // Export the appropriate data source based on DATABASE_TYPE
 export default dbType === 'postgres' ? postgresDataSource : sqliteDataSource;
+