diff --git a/.claude/plans/mana-core-auth-production-readiness.md b/.claude/plans/mana-core-auth-production-readiness.md
index d905357aa..5e6e9f9b1 100644
--- a/.claude/plans/mana-core-auth-production-readiness.md
+++ b/.claude/plans/mana-core-auth-production-readiness.md
@@ -1,6 +1,6 @@
 # Mana Core Auth - Production Readiness Plan
 
-> **Status**: In Bearbeitung
+> **Status**: ✅ Abgeschlossen
 > **Erstellt**: 2026-02-01
 > **Autor**: Claude Code
 > **Ziel**: Auth-Service produktionsreif machen
@@ -126,14 +126,29 @@ Dieses Dokument beschreibt alle Änderungen, die vor dem Go-Live des `mana-core-
 - **Datei**: `docs/PRODUCTION_DEPLOYMENT.md`
 
 ### 2.3 Grafana Dashboard & Alerts
-- **Status**: [ ] Offen (Separates Task)
+- **Status**: [x] Erledigt (2026-02-01)
 - **Priorität**: 🟠 Hoch
 - **Problem**: Prometheus Metrics existieren, aber keine Visualisierung
-- **Notiz**: Prometheus Metrics sind bereits unter `/metrics` verfügbar
-- **TODO für später**:
-  - Grafana Dashboard JSON erstellen
-  - Alert Rules für kritische Metriken (Error Rate, Latency)
-  - Loki Integration für Log-Aggregation
+- **Lösung**:
+  - ✅ Dediziertes Auth-Service Dashboard erstellt (`docker/grafana/dashboards/auth-service.json`)
+  - ✅ Service Health (UP/DOWN, Uptime, CPU, Memory, Event Loop)
+  - ✅ User Statistics (Total, Verified, New Today/Week/Month, Verification Rate)
+  - ✅ HTTP Traffic (Request Rate, Latency p50/p95/p99, Status Codes, Error Rates)
+  - ✅ Authentication Endpoints (Login/Register/Logout/Refresh Activity)
+  - ✅ Prometheus Alert Rules für Auth-Service (`docker/prometheus/alerts.yml`)
+    - AuthServiceDown (kritisch nach 30s)
+    - HighLoginFailureRate (>50%)
+    - PossibleBruteForce (>100 failed logins/5min)
+    - HighRateLimitHits
+    - RegistrationSpike
+    - TokenRefreshFailures
+    - PasswordResetFlood
+    - LowVerificationRate
+    - AuthServiceSlow (p95 >500ms)
+    - OIDCTokenErrors
+- **Geänderte Dateien**:
+  - `docker/grafana/dashboards/auth-service.json` - NEU
+  - `docker/prometheus/alerts.yml` - Auth-Alerts hinzugefügt
 
 ### 2.4 Disaster Recovery Dokumentation
 - **Status**: [x] Erledigt (2026-02-01)
@@ -254,12 +269,11 @@ Dieses Dokument beschreibt alle Änderungen, die vor dem Go-Live des `mana-core-
 | Phase | Aufgaben | Erledigt | Fortschritt |
 |-------|----------|----------|-------------|
 | Phase 1 | 5 | 5 | 100% |
-| Phase 2 | 6 | 5 | 83% |
+| Phase 2 | 6 | 6 | 100% |
 | Phase 3 | 5 | 5 | 100% |
-| **Gesamt** | **16** | **15** | **94%** |
+| **Gesamt** | **16** | **16** | **100%** |
 
-**Hinweis:** Phase 2.3 (Grafana Dashboard) ist als separates Task für später markiert.
-**Offen:** 2.3 (Grafana Dashboard)
+**Status: PRODUCTION READY** ✅
 
 ---
 
@@ -283,4 +297,7 @@ Dieses Dokument beschreibt alle Änderungen, die vor dem Go-Live des `mana-core-
 | 2026-02-01 | 3.5 Security Scanning: pnpm audit in CI, Dependabot war bereits aktiv |
 | 2026-02-01 | 3.2 OpenAPI/Swagger: API-Dokumentation unter /api-docs verfügbar |
 | 2026-02-01 | 3.1 E2E Tests: OIDC + Auth Flow Tests erstellt (oidc.e2e-spec.ts, auth-flow.e2e-spec.ts) |
+| 2026-02-01 | 2.3 Grafana Dashboard + Alerts: auth-service.json Dashboard, 10 Auth-spezifische Alert Rules |
+| 2026-02-01 | Test-Fixes: LoggerService Mock in better-auth.service.spec.ts, name assertion in auth.controller.spec.ts, createRemoteJWKSet Mock in jwt-auth.guard.spec.ts |
+| 2026-02-01 | **PLAN ABGESCHLOSSEN - 100% Production Ready (199/199 Unit Tests bestanden)** |
 
diff --git a/docker/grafana/dashboards/auth-service.json b/docker/grafana/dashboards/auth-service.json
new file mode 100644
index 000000000..269a454a9
--- /dev/null
+++ b/docker/grafana/dashboards/auth-service.json
@@ -0,0 +1,1099 @@
+{
+	"annotations": {
+		"list": []
+	},
+	"editable": true,
+	"fiscalYearStartMonth": 0,
+	"graphTooltip": 1,
+	"id": null,
+	"links": [
+		{
+			"asDropdown": false,
+			"icon": "external link",
+			"includeVars": true,
+			"keepTime": true,
+			"tags": [],
+			"targetBlank": false,
+			"title": "Master Overview",
+			"type": "link",
+			"url": "/d/master-overview/master-overview"
+		}
+	],
+	"panels": [
+		{
+			"collapsed": false,
+			"gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },
+			"id": 1,
+			"panels": [],
+			"title": "Service Health",
+			"type": "row"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [
+						{
+							"options": {
+								"0": { "color": "red", "index": 1, "text": "DOWN" },
+								"1": { "color": "green", "index": 0, "text": "UP" }
+							},
+							"type": "value"
+						}
+					],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "red", "value": null },
+							{ "color": "green", "value": 1 }
+						]
+					}
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 0, "y": 1 },
+			"id": 2,
+			"options": {
+				"colorMode": "background",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "up{job=\"mana-core-auth\"}",
+					"legendFormat": "Auth Service",
+					"refId": "A"
+				}
+			],
+			"title": "Service Status",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "blue", "value": null }]
+					},
+					"unit": "s"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 4, "y": 1 },
+			"id": 3,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "process_uptime_seconds{job=\"mana-core-auth\"}",
+					"legendFormat": "Uptime",
+					"refId": "A"
+				}
+			],
+			"title": "Uptime",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "green", "value": null },
+							{ "color": "yellow", "value": 70 },
+							{ "color": "red", "value": 85 }
+						]
+					},
+					"unit": "percent"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 8, "y": 1 },
+			"id": 4,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "100 * (1 - avg(rate(auth_process_cpu_seconds_total{job=\"mana-core-auth\"}[5m])))",
+					"legendFormat": "CPU",
+					"refId": "A"
+				}
+			],
+			"title": "CPU Usage",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "green", "value": null },
+							{ "color": "yellow", "value": 70 },
+							{ "color": "red", "value": 85 }
+						]
+					},
+					"unit": "percent"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 12, "y": 1 },
+			"id": 5,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "100 * auth_nodejs_heap_size_used_bytes{job=\"mana-core-auth\"} / auth_nodejs_heap_size_total_bytes{job=\"mana-core-auth\"}",
+					"legendFormat": "Heap",
+					"refId": "A"
+				}
+			],
+			"title": "Memory Usage",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "purple", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 16, "y": 1 },
+			"id": 6,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_nodejs_active_handles_total{job=\"mana-core-auth\"}",
+					"legendFormat": "Handles",
+					"refId": "A"
+				}
+			],
+			"title": "Active Handles",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "green", "value": null },
+							{ "color": "yellow", "value": 0.1 },
+							{ "color": "red", "value": 0.5 }
+						]
+					},
+					"unit": "s"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 20, "y": 1 },
+			"id": 7,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "rate(auth_nodejs_eventloop_lag_seconds{job=\"mana-core-auth\"}[5m])",
+					"legendFormat": "Event Loop Lag",
+					"refId": "A"
+				}
+			],
+			"title": "Event Loop Lag",
+			"type": "stat"
+		},
+		{
+			"collapsed": false,
+			"gridPos": { "h": 1, "w": 24, "x": 0, "y": 5 },
+			"id": 10,
+			"panels": [],
+			"title": "User Statistics",
+			"type": "row"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "blue", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 0, "y": 6 },
+			"id": 11,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_users_total{job=\"mana-core-auth\"}",
+					"legendFormat": "Total Users",
+					"refId": "A"
+				}
+			],
+			"title": "Total Users",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 4, "y": 6 },
+			"id": 12,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_users_verified{job=\"mana-core-auth\"}",
+					"legendFormat": "Verified",
+					"refId": "A"
+				}
+			],
+			"title": "Verified Users",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "purple", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 8, "y": 6 },
+			"id": 13,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_users_created_today{job=\"mana-core-auth\"}",
+					"legendFormat": "Today",
+					"refId": "A"
+				}
+			],
+			"title": "New Today",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "orange", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 12, "y": 6 },
+			"id": 14,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_users_created_this_week{job=\"mana-core-auth\"}",
+					"legendFormat": "This Week",
+					"refId": "A"
+				}
+			],
+			"title": "New This Week",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "yellow", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 16, "y": 6 },
+			"id": 15,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "auth_users_created_this_month{job=\"mana-core-auth\"}",
+					"legendFormat": "This Month",
+					"refId": "A"
+				}
+			],
+			"title": "New This Month",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "red", "value": null },
+							{ "color": "yellow", "value": 50 },
+							{ "color": "green", "value": 80 }
+						]
+					},
+					"unit": "percent"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 4, "x": 20, "y": 6 },
+			"id": 16,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "none",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "value_and_name"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "100 * auth_users_verified{job=\"mana-core-auth\"} / auth_users_total{job=\"mana-core-auth\"}",
+					"legendFormat": "Verification Rate",
+					"refId": "A"
+				}
+			],
+			"title": "Verification Rate",
+			"type": "stat"
+		},
+		{
+			"collapsed": false,
+			"gridPos": { "h": 1, "w": 24, "x": 0, "y": 10 },
+			"id": 20,
+			"panels": [],
+			"title": "HTTP Traffic",
+			"type": "row"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "palette-classic" },
+					"custom": {
+						"axisBorderShow": false,
+						"axisCenteredZero": false,
+						"axisColorMode": "text",
+						"axisLabel": "",
+						"axisPlacement": "auto",
+						"barAlignment": 0,
+						"drawStyle": "line",
+						"fillOpacity": 20,
+						"gradientMode": "opacity",
+						"hideFrom": { "legend": false, "tooltip": false, "viz": false },
+						"insertNulls": false,
+						"lineInterpolation": "smooth",
+						"lineWidth": 2,
+						"pointSize": 5,
+						"scaleDistribution": { "type": "linear" },
+						"showPoints": "never",
+						"spanNulls": false,
+						"stacking": { "group": "A", "mode": "none" },
+						"thresholdsStyle": { "mode": "off" }
+					},
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "reqps"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 8, "w": 12, "x": 0, "y": 11 },
+			"id": 21,
+			"options": {
+				"legend": {
+					"calcs": ["mean", "max"],
+					"displayMode": "table",
+					"placement": "bottom",
+					"showLegend": true
+				},
+				"tooltip": { "mode": "multi", "sort": "desc" }
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "sum(rate(http_requests_total{job=\"mana-core-auth\"}[5m])) by (route)",
+					"legendFormat": "{{route}}",
+					"refId": "A"
+				}
+			],
+			"title": "Request Rate by Route",
+			"type": "timeseries"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "palette-classic" },
+					"custom": {
+						"axisBorderShow": false,
+						"axisCenteredZero": false,
+						"axisColorMode": "text",
+						"axisLabel": "",
+						"axisPlacement": "auto",
+						"barAlignment": 0,
+						"drawStyle": "line",
+						"fillOpacity": 20,
+						"gradientMode": "opacity",
+						"hideFrom": { "legend": false, "tooltip": false, "viz": false },
+						"insertNulls": false,
+						"lineInterpolation": "smooth",
+						"lineWidth": 2,
+						"pointSize": 5,
+						"scaleDistribution": { "type": "linear" },
+						"showPoints": "never",
+						"spanNulls": false,
+						"stacking": { "group": "A", "mode": "none" },
+						"thresholdsStyle": { "mode": "off" }
+					},
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "s"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 8, "w": 12, "x": 12, "y": 11 },
+			"id": 22,
+			"options": {
+				"legend": {
+					"calcs": ["mean", "max"],
+					"displayMode": "table",
+					"placement": "bottom",
+					"showLegend": true
+				},
+				"tooltip": { "mode": "multi", "sort": "desc" }
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "histogram_quantile(0.50, sum(rate(http_request_duration_seconds_bucket{job=\"mana-core-auth\"}[5m])) by (le))",
+					"legendFormat": "p50",
+					"refId": "A"
+				},
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "histogram_quantile(0.95, sum(rate(http_request_duration_seconds_bucket{job=\"mana-core-auth\"}[5m])) by (le))",
+					"legendFormat": "p95",
+					"refId": "B"
+				},
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "histogram_quantile(0.99, sum(rate(http_request_duration_seconds_bucket{job=\"mana-core-auth\"}[5m])) by (le))",
+					"legendFormat": "p99",
+					"refId": "C"
+				}
+			],
+			"title": "Response Time Percentiles",
+			"type": "timeseries"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "palette-classic" },
+					"custom": {
+						"axisBorderShow": false,
+						"axisCenteredZero": false,
+						"axisColorMode": "text",
+						"axisLabel": "",
+						"axisPlacement": "auto",
+						"barAlignment": 0,
+						"drawStyle": "line",
+						"fillOpacity": 20,
+						"gradientMode": "opacity",
+						"hideFrom": { "legend": false, "tooltip": false, "viz": false },
+						"insertNulls": false,
+						"lineInterpolation": "smooth",
+						"lineWidth": 2,
+						"pointSize": 5,
+						"scaleDistribution": { "type": "linear" },
+						"showPoints": "never",
+						"spanNulls": false,
+						"stacking": { "group": "A", "mode": "normal" },
+						"thresholdsStyle": { "mode": "off" }
+					},
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "reqps"
+				},
+				"overrides": [
+					{
+						"matcher": { "id": "byRegexp", "options": ".*5.." },
+						"properties": [{ "id": "color", "value": { "fixedColor": "red", "mode": "fixed" } }]
+					},
+					{
+						"matcher": { "id": "byRegexp", "options": ".*4.." },
+						"properties": [{ "id": "color", "value": { "fixedColor": "yellow", "mode": "fixed" } }]
+					},
+					{
+						"matcher": { "id": "byRegexp", "options": ".*2.." },
+						"properties": [{ "id": "color", "value": { "fixedColor": "green", "mode": "fixed" } }]
+					}
+				]
+			},
+			"gridPos": { "h": 8, "w": 12, "x": 0, "y": 19 },
+			"id": 23,
+			"options": {
+				"legend": {
+					"calcs": ["sum"],
+					"displayMode": "table",
+					"placement": "bottom",
+					"showLegend": true
+				},
+				"tooltip": { "mode": "multi", "sort": "desc" }
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "sum(rate(http_requests_total{job=\"mana-core-auth\"}[5m])) by (status)",
+					"legendFormat": "{{status}}",
+					"refId": "A"
+				}
+			],
+			"title": "Requests by Status Code",
+			"type": "timeseries"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "green", "value": null },
+							{ "color": "yellow", "value": 1 },
+							{ "color": "red", "value": 5 }
+						]
+					},
+					"unit": "percent"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 6, "x": 12, "y": 19 },
+			"id": 24,
+			"options": {
+				"colorMode": "background",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "100 * sum(rate(http_requests_total{job=\"mana-core-auth\",status=~\"4..\"}[5m])) / sum(rate(http_requests_total{job=\"mana-core-auth\"}[5m]))",
+					"legendFormat": "4xx Error Rate",
+					"refId": "A"
+				}
+			],
+			"title": "Client Error Rate (4xx)",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [
+							{ "color": "green", "value": null },
+							{ "color": "yellow", "value": 0.5 },
+							{ "color": "red", "value": 1 }
+						]
+					},
+					"unit": "percent"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 6, "x": 18, "y": 19 },
+			"id": 25,
+			"options": {
+				"colorMode": "background",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "100 * sum(rate(http_requests_total{job=\"mana-core-auth\",status=~\"5..\"}[5m])) / sum(rate(http_requests_total{job=\"mana-core-auth\"}[5m]))",
+					"legendFormat": "5xx Error Rate",
+					"refId": "A"
+				}
+			],
+			"title": "Server Error Rate (5xx)",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "orange", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 6, "x": 12, "y": 23 },
+			"id": 26,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "sum(increase(http_requests_total{job=\"mana-core-auth\",status=\"429\"}[1h]))",
+					"legendFormat": "Rate Limited",
+					"refId": "A"
+				}
+			],
+			"title": "Rate Limited (last 1h)",
+			"type": "stat"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "thresholds" },
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "blue", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": []
+			},
+			"gridPos": { "h": 4, "w": 6, "x": 18, "y": 23 },
+			"id": 27,
+			"options": {
+				"colorMode": "value",
+				"graphMode": "area",
+				"justifyMode": "center",
+				"orientation": "auto",
+				"reduceOptions": {
+					"calcs": ["lastNotNull"],
+					"fields": "",
+					"values": false
+				},
+				"textMode": "auto"
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "sum(increase(http_requests_total{job=\"mana-core-auth\"}[24h]))",
+					"legendFormat": "Total Requests",
+					"refId": "A"
+				}
+			],
+			"title": "Total Requests (24h)",
+			"type": "stat"
+		},
+		{
+			"collapsed": false,
+			"gridPos": { "h": 1, "w": 24, "x": 0, "y": 27 },
+			"id": 30,
+			"panels": [],
+			"title": "Authentication Endpoints",
+			"type": "row"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "palette-classic" },
+					"custom": {
+						"axisBorderShow": false,
+						"axisCenteredZero": false,
+						"axisColorMode": "text",
+						"axisLabel": "",
+						"axisPlacement": "auto",
+						"barAlignment": 0,
+						"drawStyle": "bars",
+						"fillOpacity": 80,
+						"gradientMode": "none",
+						"hideFrom": { "legend": false, "tooltip": false, "viz": false },
+						"insertNulls": false,
+						"lineInterpolation": "linear",
+						"lineWidth": 1,
+						"pointSize": 5,
+						"scaleDistribution": { "type": "linear" },
+						"showPoints": "never",
+						"spanNulls": false,
+						"stacking": { "group": "A", "mode": "normal" },
+						"thresholdsStyle": { "mode": "off" }
+					},
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": [
+					{
+						"matcher": { "id": "byName", "options": "login" },
+						"properties": [{ "id": "color", "value": { "fixedColor": "blue", "mode": "fixed" } }]
+					},
+					{
+						"matcher": { "id": "byName", "options": "register" },
+						"properties": [{ "id": "color", "value": { "fixedColor": "green", "mode": "fixed" } }]
+					},
+					{
+						"matcher": { "id": "byName", "options": "logout" },
+						"properties": [{ "id": "color", "value": { "fixedColor": "orange", "mode": "fixed" } }]
+					},
+					{
+						"matcher": { "id": "byName", "options": "refresh" },
+						"properties": [{ "id": "color", "value": { "fixedColor": "purple", "mode": "fixed" } }]
+					}
+				]
+			},
+			"gridPos": { "h": 8, "w": 12, "x": 0, "y": 28 },
+			"id": 31,
+			"options": {
+				"legend": {
+					"calcs": ["sum"],
+					"displayMode": "table",
+					"placement": "bottom",
+					"showLegend": true
+				},
+				"tooltip": { "mode": "multi", "sort": "desc" }
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "increase(http_requests_total{job=\"mana-core-auth\",route=~\"/auth/login|/auth/register|/auth/logout|/auth/refresh\"}[1h])",
+					"legendFormat": "{{route}}",
+					"refId": "A"
+				}
+			],
+			"title": "Auth Actions (last 1h)",
+			"type": "timeseries"
+		},
+		{
+			"datasource": { "type": "prometheus", "uid": "${datasource}" },
+			"fieldConfig": {
+				"defaults": {
+					"color": { "mode": "palette-classic" },
+					"custom": {
+						"axisBorderShow": false,
+						"axisCenteredZero": false,
+						"axisColorMode": "text",
+						"axisLabel": "",
+						"axisPlacement": "auto",
+						"barAlignment": 0,
+						"drawStyle": "line",
+						"fillOpacity": 20,
+						"gradientMode": "opacity",
+						"hideFrom": { "legend": false, "tooltip": false, "viz": false },
+						"insertNulls": false,
+						"lineInterpolation": "smooth",
+						"lineWidth": 2,
+						"pointSize": 5,
+						"scaleDistribution": { "type": "linear" },
+						"showPoints": "never",
+						"spanNulls": false,
+						"stacking": { "group": "A", "mode": "none" },
+						"thresholdsStyle": { "mode": "off" }
+					},
+					"mappings": [],
+					"thresholds": {
+						"mode": "absolute",
+						"steps": [{ "color": "green", "value": null }]
+					},
+					"unit": "short"
+				},
+				"overrides": [
+					{
+						"matcher": { "id": "byRegexp", "options": ".*401.*" },
+						"properties": [{ "id": "color", "value": { "fixedColor": "red", "mode": "fixed" } }]
+					}
+				]
+			},
+			"gridPos": { "h": 8, "w": 12, "x": 12, "y": 28 },
+			"id": 32,
+			"options": {
+				"legend": {
+					"calcs": ["sum"],
+					"displayMode": "table",
+					"placement": "bottom",
+					"showLegend": true
+				},
+				"tooltip": { "mode": "multi", "sort": "desc" }
+			},
+			"pluginVersion": "10.0.0",
+			"targets": [
+				{
+					"datasource": { "type": "prometheus", "uid": "${datasource}" },
+					"expr": "sum(increase(http_requests_total{job=\"mana-core-auth\",route=\"/auth/login\"}[1h])) by (status)",
+					"legendFormat": "Login {{status}}",
+					"refId": "A"
+				}
+			],
+			"title": "Login Attempts by Status",
+			"type": "timeseries"
+		}
+	],
+	"refresh": "30s",
+	"schemaVersion": 38,
+	"tags": ["manacore", "auth"],
+	"templating": {
+		"list": [
+			{
+				"current": {
+					"selected": false,
+					"text": "Prometheus",
+					"value": "prometheus"
+				},
+				"hide": 0,
+				"includeAll": false,
+				"label": "Datasource",
+				"multi": false,
+				"name": "datasource",
+				"options": [],
+				"query": "prometheus",
+				"refresh": 1,
+				"regex": "",
+				"skipUrlSync": false,
+				"type": "datasource"
+			}
+		]
+	},
+	"time": { "from": "now-1h", "to": "now" },
+	"timepicker": {},
+	"timezone": "browser",
+	"title": "Auth Service",
+	"uid": "auth-service",
+	"version": 1,
+	"weekStart": "monday"
+}
diff --git a/docker/prometheus/alerts.yml b/docker/prometheus/alerts.yml
index f05400d47..fed4680a8 100644
--- a/docker/prometheus/alerts.yml
+++ b/docker/prometheus/alerts.yml
@@ -243,3 +243,116 @@ groups:
         annotations:
           summary: "Container {{ $labels.name }} restarted"
           description: "Container {{ $labels.name }} has restarted."
+
+  - name: auth_service_alerts
+    rules:
+      # Auth Service Down
+      - alert: AuthServiceDown
+        expr: up{job="mana-core-auth"} == 0
+        for: 30s
+        labels:
+          severity: critical
+        annotations:
+          summary: "Auth Service is down"
+          description: "mana-core-auth has been down for more than 30 seconds. All authentication will fail."
+
+      # High Login Failure Rate (> 50% of logins fail with 401)
+      - alert: HighLoginFailureRate
+        expr: |
+          sum(rate(http_requests_total{job="mana-core-auth",route="/auth/login",status="401"}[5m]))
+          / sum(rate(http_requests_total{job="mana-core-auth",route="/auth/login"}[5m])) > 0.5
+        for: 5m
+        labels:
+          severity: warning
+        annotations:
+          summary: "High login failure rate"
+          description: "{{ $value | humanizePercentage }} of login attempts are failing."
+
+      # Rate Limiting Triggered Frequently
+      - alert: HighRateLimitHits
+        expr: |
+          sum(rate(http_requests_total{job="mana-core-auth",status="429"}[5m])) > 1
+        for: 5m
+        labels:
+          severity: warning
+        annotations:
+          summary: "Frequent rate limiting on Auth Service"
+          description: "Rate limit (429) is being hit {{ $value | humanize }} times/second. Possible attack or misconfiguration."
+
+      # Brute Force Detection (> 100 failed logins in 5 min)
+      - alert: PossibleBruteForce
+        expr: |
+          sum(increase(http_requests_total{job="mana-core-auth",route="/auth/login",status="401"}[5m])) > 100
+        for: 0m
+        labels:
+          severity: critical
+        annotations:
+          summary: "Possible brute force attack detected"
+          description: "{{ $value | humanize }} failed login attempts in the last 5 minutes."
+
+      # Registration Spike (unusual registration activity)
+      - alert: RegistrationSpike
+        expr: |
+          sum(rate(http_requests_total{job="mana-core-auth",route="/auth/register",status="201"}[5m])) > 1
+        for: 5m
+        labels:
+          severity: info
+        annotations:
+          summary: "High registration activity"
+          description: "{{ $value | humanize }} registrations per second. Verify this is expected."
+
+      # Token Refresh Failures
+      - alert: HighTokenRefreshFailures
+        expr: |
+          sum(rate(http_requests_total{job="mana-core-auth",route="/auth/refresh",status=~"4.."}[5m]))
+          / sum(rate(http_requests_total{job="mana-core-auth",route="/auth/refresh"}[5m])) > 0.3
+        for: 10m
+        labels:
+          severity: warning
+        annotations:
+          summary: "High token refresh failure rate"
+          description: "{{ $value | humanizePercentage }} of token refresh attempts are failing."
+
+      # Password Reset Flood (possible enumeration attack)
+      - alert: PasswordResetFlood
+        expr: |
+          sum(increase(http_requests_total{job="mana-core-auth",route="/auth/forgot-password"}[5m])) > 50
+        for: 0m
+        labels:
+          severity: warning
+        annotations:
+          summary: "Unusual password reset activity"
+          description: "{{ $value | humanize }} password reset requests in the last 5 minutes."
+
+      # Low User Verification Rate (less than 50% verified after 1 week)
+      - alert: LowVerificationRate
+        expr: |
+          auth_users_verified{job="mana-core-auth"} / auth_users_total{job="mana-core-auth"} < 0.5
+        for: 1h
+        labels:
+          severity: info
+        annotations:
+          summary: "Low email verification rate"
+          description: "Only {{ $value | humanizePercentage }} of users have verified their email."
+
+      # Auth Service Slow (p95 > 500ms)
+      - alert: AuthServiceSlow
+        expr: |
+          histogram_quantile(0.95, sum(rate(http_request_duration_seconds_bucket{job="mana-core-auth"}[5m])) by (le)) > 0.5
+        for: 5m
+        labels:
+          severity: warning
+        annotations:
+          summary: "Auth Service responding slowly"
+          description: "Auth service p95 latency is {{ $value | humanizeDuration }}. This may impact all services."
+
+      # OIDC Token Endpoint Errors
+      - alert: OIDCTokenErrors
+        expr: |
+          sum(rate(http_requests_total{job="mana-core-auth",route=~"/api/auth/oauth2/token|/api/oidc/token",status=~"5.."}[5m])) > 0.1
+        for: 5m
+        labels:
+          severity: warning
+        annotations:
+          summary: "OIDC token endpoint errors"
+          description: "OIDC token endpoint is returning 5xx errors. SSO may be affected."
diff --git a/services/mana-core-auth/src/__tests__/utils/test-helpers.ts b/services/mana-core-auth/src/__tests__/utils/test-helpers.ts
index 41ab92f31..24e9fa101 100644
--- a/services/mana-core-auth/src/__tests__/utils/test-helpers.ts
+++ b/services/mana-core-auth/src/__tests__/utils/test-helpers.ts
@@ -4,7 +4,7 @@
  * Common utilities for writing tests
  */
 
-import { ConfigService } from '@nestjs/config';
+import { type ConfigService } from '@nestjs/config';
 
 /**
  * Create mock ConfigService
diff --git a/services/mana-core-auth/src/analytics/analytics.service.ts b/services/mana-core-auth/src/analytics/analytics.service.ts
index b0a99ae7e..b47ffe100 100644
--- a/services/mana-core-auth/src/analytics/analytics.service.ts
+++ b/services/mana-core-auth/src/analytics/analytics.service.ts
@@ -148,7 +148,7 @@ export class AnalyticsService implements OnModuleInit, OnModuleDestroy {
 	/**
 	 * Get user growth over time
 	 */
-	async getUserGrowth(days: number = 90): Promise<GrowthData[]> {
+	async getUserGrowth(days = 90): Promise<GrowthData[]> {
 		if (!this.duckdb) return [];
 
 		const result = await this.duckdb.all(
@@ -171,7 +171,7 @@ export class AnalyticsService implements OnModuleInit, OnModuleDestroy {
 	/**
 	 * Get monthly aggregated metrics
 	 */
-	async getMonthlyMetrics(months: number = 12): Promise<MonthlyMetrics[]> {
+	async getMonthlyMetrics(months = 12): Promise<MonthlyMetrics[]> {
 		if (!this.duckdb) return [];
 
 		const result = await this.duckdb.all(
diff --git a/services/mana-core-auth/src/auth/auth.controller.spec.ts b/services/mana-core-auth/src/auth/auth.controller.spec.ts
index 50ee1b505..4ac860222 100644
--- a/services/mana-core-auth/src/auth/auth.controller.spec.ts
+++ b/services/mana-core-auth/src/auth/auth.controller.spec.ts
@@ -139,7 +139,8 @@ describe('AuthController', () => {
 			expect(betterAuthService.registerB2C).toHaveBeenCalledWith({
 				email: registerDto.email,
 				password: registerDto.password,
-				name: undefined, // Controller passes undefined when name is not provided
+				name: '', // Controller passes empty string as fallback when name is not provided
+				sourceAppUrl: undefined,
 			});
 		});
 
diff --git a/services/mana-core-auth/src/auth/auth.module.ts b/services/mana-core-auth/src/auth/auth.module.ts
index 961c6331a..3554b6b35 100644
--- a/services/mana-core-auth/src/auth/auth.module.ts
+++ b/services/mana-core-auth/src/auth/auth.module.ts
@@ -8,7 +8,12 @@ import { ReferralsModule } from '../referrals/referrals.module';
 
 @Module({
 	imports: [forwardRef(() => ReferralsModule)],
-	controllers: [AuthController, BetterAuthPassthroughController, OidcController, OidcLoginController],
+	controllers: [
+		AuthController,
+		BetterAuthPassthroughController,
+		OidcController,
+		OidcLoginController,
+	],
 	providers: [BetterAuthService],
 	exports: [BetterAuthService],
 })
diff --git a/services/mana-core-auth/src/auth/jwt-validation.spec.ts b/services/mana-core-auth/src/auth/jwt-validation.spec.ts
index 5e2d03d3a..29586b58f 100644
--- a/services/mana-core-auth/src/auth/jwt-validation.spec.ts
+++ b/services/mana-core-auth/src/auth/jwt-validation.spec.ts
@@ -22,9 +22,9 @@
  */
 
 import { Test, TestingModule } from '@nestjs/testing';
-import { ConfigService } from '@nestjs/config';
+import { type ConfigService } from '@nestjs/config';
 import { SignJWT, jwtVerify, errors } from 'jose';
-import { JWTCustomPayload } from './better-auth.config';
+import { type JWTCustomPayload } from './better-auth.config';
 import { createMockConfigService } from '../__tests__/utils/test-helpers';
 import { mockUserFactory } from '../__tests__/utils/mock-factories';
 
diff --git a/services/mana-core-auth/src/auth/services/better-auth.service.spec.ts b/services/mana-core-auth/src/auth/services/better-auth.service.spec.ts
index 42619cf5c..9d7c2ce3a 100644
--- a/services/mana-core-auth/src/auth/services/better-auth.service.spec.ts
+++ b/services/mana-core-auth/src/auth/services/better-auth.service.spec.ts
@@ -14,6 +14,7 @@ import type { TestingModule } from '@nestjs/testing';
 import { ConfigService } from '@nestjs/config';
 import { ConflictException, NotFoundException, ForbiddenException } from '@nestjs/common';
 import { BetterAuthService } from './better-auth.service';
+import { LoggerService } from '../../common/logger';
 import { createMockConfigService } from '../../__tests__/utils/test-helpers';
 import { silentError } from '../../__tests__/utils/silent-error.decorator';
 
@@ -68,6 +69,15 @@ const mockReferralTrackingService = {
 	applyReferral: jest.fn().mockResolvedValue({ success: true }),
 };
 
+const mockLoggerService = {
+	setContext: jest.fn().mockReturnThis(),
+	log: jest.fn(),
+	debug: jest.fn(),
+	warn: jest.fn(),
+	error: jest.fn(),
+	verbose: jest.fn(),
+};
+
 describe('BetterAuthService', () => {
 	let service: BetterAuthService;
 	let configService: ConfigService;
@@ -116,6 +126,10 @@ describe('BetterAuthService', () => {
 					provide: ReferralTrackingService,
 					useValue: mockReferralTrackingService,
 				},
+				{
+					provide: LoggerService,
+					useValue: mockLoggerService,
+				},
 			],
 		}).compile();
 
diff --git a/services/mana-core-auth/src/common/guards/jwt-auth.guard.spec.ts b/services/mana-core-auth/src/common/guards/jwt-auth.guard.spec.ts
index 63329ae1d..d0dd1851a 100644
--- a/services/mana-core-auth/src/common/guards/jwt-auth.guard.spec.ts
+++ b/services/mana-core-auth/src/common/guards/jwt-auth.guard.spec.ts
@@ -17,11 +17,16 @@ import { LoggerService } from '../logger';
 import { createMockConfigService, httpMockHelpers } from '../../__tests__/utils/test-helpers';
 import { mockTokenFactory } from '../../__tests__/utils/mock-factories';
 import { silentError } from '../../__tests__/utils/silent-error.decorator';
-import { jwtVerify } from 'jose';
+import { jwtVerify, createRemoteJWKSet } from 'jose';
 
 // Mock jose (auto-mocked via jest.config.js moduleNameMapper)
 jest.mock('jose');
 
+// Setup mock for createRemoteJWKSet to return a defined JWKS function
+const mockJWKS = jest.fn();
+const mockCreateRemoteJWKSet = createRemoteJWKSet as jest.MockedFunction<typeof createRemoteJWKSet>;
+mockCreateRemoteJWKSet.mockReturnValue(mockJWKS as any);
+
 // Mock LoggerService
 const createMockLoggerService = (): LoggerService =>
 	({
@@ -43,6 +48,9 @@ describe('JwtAuthGuard', () => {
 		// Reset mocks
 		jest.clearAllMocks();
 
+		// Ensure createRemoteJWKSet returns a defined value after clearing
+		mockCreateRemoteJWKSet.mockReturnValue(mockJWKS as any);
+
 		const module: TestingModule = await Test.createTestingModule({
 			providers: [
 				JwtAuthGuard,
diff --git a/services/mana-core-auth/src/credits/credits.controller.spec.ts b/services/mana-core-auth/src/credits/credits.controller.spec.ts
index 88cfd5360..1accad709 100644
--- a/services/mana-core-auth/src/credits/credits.controller.spec.ts
+++ b/services/mana-core-auth/src/credits/credits.controller.spec.ts
@@ -23,7 +23,7 @@ import { BadRequestException, ForbiddenException, NotFoundException } from '@nes
 import { CreditsController } from './credits.controller';
 import { CreditsService } from './credits.service';
 import { JwtAuthGuard } from '../common/guards/jwt-auth.guard';
-import { CurrentUserData } from '../common/decorators/current-user.decorator';
+import { type CurrentUserData } from '../common/decorators/current-user.decorator';
 import {
 	mockBalanceFactory,
 	mockTransactionFactory,
diff --git a/services/mana-core-auth/src/referrals/services/fraud-detection.service.ts b/services/mana-core-auth/src/referrals/services/fraud-detection.service.ts
index 5403ea602..ba56d52dd 100644
--- a/services/mana-core-auth/src/referrals/services/fraud-detection.service.ts
+++ b/services/mana-core-auth/src/referrals/services/fraud-detection.service.ts
@@ -466,7 +466,7 @@ export class FraudDetectionService {
 	/**
 	 * Get pending review items
 	 */
-	async getPendingReviews(limit: number = 50, offset: number = 0): Promise<ReviewQueueItem[]> {
+	async getPendingReviews(limit = 50, offset = 0): Promise<ReviewQueueItem[]> {
 		const db = this.getDb();
 
 		return db
diff --git a/services/mana-core-auth/src/referrals/services/referral-tier.service.ts b/services/mana-core-auth/src/referrals/services/referral-tier.service.ts
index 624fd501d..0e653e6db 100644
--- a/services/mana-core-auth/src/referrals/services/referral-tier.service.ts
+++ b/services/mana-core-auth/src/referrals/services/referral-tier.service.ts
@@ -107,7 +107,7 @@ export class ReferralTierService {
 	calculateBonus(
 		eventType: keyof typeof BONUS_AMOUNTS,
 		tier: TierName,
-		isReferrer: boolean = true
+		isReferrer = true
 	): { base: number; multiplier: number; final: number } {
 		const bonusConfig = BONUS_AMOUNTS[eventType];
 		const base = isReferrer ? bonusConfig.referrer : bonusConfig.referee;
diff --git a/services/mana-core-auth/src/referrals/services/referral-tracking.service.ts b/services/mana-core-auth/src/referrals/services/referral-tracking.service.ts
index b72c5ec2c..1f87ebb10 100644
--- a/services/mana-core-auth/src/referrals/services/referral-tracking.service.ts
+++ b/services/mana-core-auth/src/referrals/services/referral-tracking.service.ts
@@ -501,8 +501,8 @@ export class ReferralTrackingService {
 	async getReferredUsers(
 		userId: string,
 		status?: string,
-		limit: number = 20,
-		offset: number = 0
+		limit = 20,
+		offset = 0
 	): Promise<PaginatedResponse<ReferredUser>> {
 		const db = this.getDb();
 
@@ -734,7 +734,7 @@ export class ReferralTrackingService {
 	): Promise<number> {
 		// Basic fraud score calculation
 		// Full fraud detection will be implemented in Phase 3
-		let score = 0;
+		const score = 0;
 
 		// For now, just return 0 (no fraud detected)
 		// TODO: Implement full fraud detection in Phase 3