diff --git a/it0-web-admin/src/app/(admin)/agent-config/hooks/page.tsx b/it0-web-admin/src/app/(admin)/agent-config/hooks/page.tsx
index 1502515..84c099b 100644
--- a/it0-web-admin/src/app/(admin)/agent-config/hooks/page.tsx
+++ b/it0-web-admin/src/app/(admin)/agent-config/hooks/page.tsx
@@ -34,10 +34,7 @@ interface HookFormData {
   description: string;
 }
 
-interface HooksResponse {
-  data: HookScript[];
-  total: number;
-}
+type HooksResponse = HookScript[];
 
 // ---------------------------------------------------------------------------
 // Constants
diff --git a/it0-web-admin/src/app/(admin)/agent-config/skills/page.tsx b/it0-web-admin/src/app/(admin)/agent-config/skills/page.tsx
index b986a26..9c3398f 100644
--- a/it0-web-admin/src/app/(admin)/agent-config/skills/page.tsx
+++ b/it0-web-admin/src/app/(admin)/agent-config/skills/page.tsx
@@ -31,10 +31,7 @@ interface SkillFormData {
   enabled: boolean;
 }
 
-interface SkillsResponse {
-  data: Skill[];
-  total: number;
-}
+type SkillsResponse = Skill[];
 
 // ---------------------------------------------------------------------------
 // Constants
diff --git a/it0-web-admin/src/app/(admin)/audit/logs/page.tsx b/it0-web-admin/src/app/(admin)/audit/logs/page.tsx
index bffdb09..b49b6a9 100644
--- a/it0-web-admin/src/app/(admin)/audit/logs/page.tsx
+++ b/it0-web-admin/src/app/(admin)/audit/logs/page.tsx
@@ -21,12 +21,7 @@ interface AuditLog {
   detail: Record<string, unknown>;
 }
 
-interface AuditLogsResponse {
-  data: AuditLog[];
-  total: number;
-  page: number;
-  pageSize: number;
-}
+type AuditLogsResponse = AuditLog[];
 
 interface Filters {
   dateFrom: string;
diff --git a/it0-web-admin/src/app/(admin)/audit/replay/page.tsx b/it0-web-admin/src/app/(admin)/audit/replay/page.tsx
index e73f153..2175731 100644
--- a/it0-web-admin/src/app/(admin)/audit/replay/page.tsx
+++ b/it0-web-admin/src/app/(admin)/audit/replay/page.tsx
@@ -42,14 +42,9 @@ interface SessionEvent {
   };
 }
 
-interface SessionsResponse {
-  data: AgentSession[];
-  total: number;
-}
+type SessionsResponse = AgentSession[];
 
-interface SessionEventsResponse {
-  data: SessionEvent[];
-}
+type SessionEventsResponse = SessionEvent[];
 
 interface Filters {
   dateFrom: string;
diff --git a/it0-web-admin/src/app/(admin)/monitoring/alert-rules/[id]/page.tsx b/it0-web-admin/src/app/(admin)/monitoring/alert-rules/[id]/page.tsx
index 74628bc..a963f4d 100644
--- a/it0-web-admin/src/app/(admin)/monitoring/alert-rules/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/monitoring/alert-rules/[id]/page.tsx
@@ -43,10 +43,7 @@ interface AlertEvent {
   resolvedAt?: string;
 }
 
-interface AlertEventsResponse {
-  data: AlertEvent[];
-  total: number;
-}
+type AlertEventsResponse = AlertEvent[];
 
 interface AlertRuleFormData {
   name: string;
diff --git a/it0-web-admin/src/app/(admin)/monitoring/alert-rules/page.tsx b/it0-web-admin/src/app/(admin)/monitoring/alert-rules/page.tsx
index ee61b27..1049a54 100644
--- a/it0-web-admin/src/app/(admin)/monitoring/alert-rules/page.tsx
+++ b/it0-web-admin/src/app/(admin)/monitoring/alert-rules/page.tsx
@@ -40,10 +40,7 @@ interface AlertRuleFormData {
   targetServers: string;
 }
 
-interface AlertRulesResponse {
-  data: AlertRule[];
-  total: number;
-}
+type AlertRulesResponse = AlertRule[];
 
 // ---------------------------------------------------------------------------
 // Constants
diff --git a/it0-web-admin/src/app/(admin)/monitoring/health-checks/page.tsx b/it0-web-admin/src/app/(admin)/monitoring/health-checks/page.tsx
index 8e3c135..ae29191 100644
--- a/it0-web-admin/src/app/(admin)/monitoring/health-checks/page.tsx
+++ b/it0-web-admin/src/app/(admin)/monitoring/health-checks/page.tsx
@@ -24,10 +24,7 @@ interface HealthCheckResult {
   message?: string;
 }
 
-interface HealthChecksResponse {
-  data: HealthCheckResult[];
-  total: number;
-}
+type HealthChecksResponse = HealthCheckResult[];
 
 type StatusFilter = 'all' | 'healthy' | 'degraded' | 'down';
 type RefreshInterval = 0 | 10 | 30 | 60;
diff --git a/it0-web-admin/src/app/(admin)/monitoring/metrics/page.tsx b/it0-web-admin/src/app/(admin)/monitoring/metrics/page.tsx
index bba4d0e..66c4d42 100644
--- a/it0-web-admin/src/app/(admin)/monitoring/metrics/page.tsx
+++ b/it0-web-admin/src/app/(admin)/monitoring/metrics/page.tsx
@@ -30,14 +30,9 @@ interface ServerMetric {
   lastCheckedAt: string;
 }
 
-interface MetricsOverviewResponse {
-  data: MetricsOverview;
-}
+type MetricsOverviewResponse = MetricsOverview;
 
-interface ServerMetricsResponse {
-  data: ServerMetric[];
-  total: number;
-}
+type ServerMetricsResponse = ServerMetric[];
 
 type EnvironmentFilter = 'all' | 'dev' | 'staging' | 'prod';
 type StatusFilter = 'all' | 'online' | 'offline';
diff --git a/it0-web-admin/src/app/(admin)/security/credentials/page.tsx b/it0-web-admin/src/app/(admin)/security/credentials/page.tsx
index 3be0260..f9bc32d 100644
--- a/it0-web-admin/src/app/(admin)/security/credentials/page.tsx
+++ b/it0-web-admin/src/app/(admin)/security/credentials/page.tsx
@@ -22,10 +22,7 @@ interface Credential {
   updatedAt: string;
 }
 
-interface CredentialsResponse {
-  data: Credential[];
-  total: number;
-}
+type CredentialsResponse = Credential[];
 
 interface CredentialFormData {
   name: string;
diff --git a/it0-web-admin/src/app/(admin)/security/permissions/page.tsx b/it0-web-admin/src/app/(admin)/security/permissions/page.tsx
index 3754664..3c0f8b7 100644
--- a/it0-web-admin/src/app/(admin)/security/permissions/page.tsx
+++ b/it0-web-admin/src/app/(admin)/security/permissions/page.tsx
@@ -31,9 +31,7 @@ interface PermissionMatrixEntry {
   granted: boolean;
 }
 
-interface PermissionsResponse {
-  data: Permission[];
-}
+type PermissionsResponse = Permission[];
 
 interface MatrixResponse {
   roles: Role[];
diff --git a/it0-web-admin/src/app/(admin)/security/risk-rules/page.tsx b/it0-web-admin/src/app/(admin)/security/risk-rules/page.tsx
index bccec02..17b03c8 100644
--- a/it0-web-admin/src/app/(admin)/security/risk-rules/page.tsx
+++ b/it0-web-admin/src/app/(admin)/security/risk-rules/page.tsx
@@ -26,10 +26,7 @@ interface RiskRuleFormData {
   description: string;
 }
 
-interface RiskRulesResponse {
-  data: RiskRule[];
-  total: number;
-}
+type RiskRulesResponse = RiskRule[];
 
 type Role = 'admin' | 'operator' | 'viewer' | 'readonly';
 type Permission =
diff --git a/it0-web-admin/src/app/(admin)/security/roles/page.tsx b/it0-web-admin/src/app/(admin)/security/roles/page.tsx
index 4432cc2..2a8577c 100644
--- a/it0-web-admin/src/app/(admin)/security/roles/page.tsx
+++ b/it0-web-admin/src/app/(admin)/security/roles/page.tsx
@@ -29,18 +29,11 @@ interface Role {
   createdAt: string;
 }
 
-interface RolesResponse {
-  data: Role[];
-  total: number;
-}
+type RolesResponse = Role[];
 
-interface RolePermissionsResponse {
-  data: Permission[];
-}
+type RolePermissionsResponse = Permission[];
 
-interface PermissionsListResponse {
-  data: Permission[];
-}
+type PermissionsListResponse = Permission[];
 
 interface RoleFormData {
   name: string;
diff --git a/it0-web-admin/src/app/(admin)/servers/[id]/page.tsx b/it0-web-admin/src/app/(admin)/servers/[id]/page.tsx
index b878a4d..1c381fa 100644
--- a/it0-web-admin/src/app/(admin)/servers/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/servers/[id]/page.tsx
@@ -62,13 +62,9 @@ interface RecentCommand {
   createdAt: string;
 }
 
-interface HealthChecksResponse {
-  data: HealthCheck[];
-}
+type HealthChecksResponse = HealthCheck[];
 
-interface RecentCommandsResponse {
-  data: RecentCommand[];
-}
+type RecentCommandsResponse = RecentCommand[];
 
 // ---------------------------------------------------------------------------
 // Status badge
diff --git a/it0-web-admin/src/app/(admin)/servers/clusters/page.tsx b/it0-web-admin/src/app/(admin)/servers/clusters/page.tsx
index 88dd97f..2cffd19 100644
--- a/it0-web-admin/src/app/(admin)/servers/clusters/page.tsx
+++ b/it0-web-admin/src/app/(admin)/servers/clusters/page.tsx
@@ -32,15 +32,9 @@ interface Server {
   environment: string;
 }
 
-interface ClustersResponse {
-  data: Cluster[];
-  total: number;
-}
+type ClustersResponse = Cluster[];
 
-interface ServersResponse {
-  data: Server[];
-  total: number;
-}
+type ServersResponse = Server[];
 
 interface ClusterFormData {
   name: string;
diff --git a/it0-web-admin/src/app/(admin)/sessions/[id]/page.tsx b/it0-web-admin/src/app/(admin)/sessions/[id]/page.tsx
index 943ba63..d7d93d1 100644
--- a/it0-web-admin/src/app/(admin)/sessions/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/sessions/[id]/page.tsx
@@ -32,9 +32,7 @@ interface SessionEvent {
   content: string;
 }
 
-interface SessionEventsResponse {
-  data: SessionEvent[];
-}
+type SessionEventsResponse = SessionEvent[];
 
 interface SessionTask {
   id: string;
@@ -43,9 +41,7 @@ interface SessionTask {
   createdAt: string;
 }
 
-interface SessionTasksResponse {
-  data: SessionTask[];
-}
+type SessionTasksResponse = SessionTask[];
 
 // ---------------------------------------------------------------------------
 // Constants
diff --git a/it0-web-admin/src/app/(admin)/standing-orders/[id]/page.tsx b/it0-web-admin/src/app/(admin)/standing-orders/[id]/page.tsx
index a8d02da..0be32f4 100644
--- a/it0-web-admin/src/app/(admin)/standing-orders/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/standing-orders/[id]/page.tsx
@@ -53,10 +53,7 @@ interface StandingOrderStats {
   lastFailureAt?: string;
 }
 
-interface ExecutionsResponse {
-  data: StandingOrderExecution[];
-  total: number;
-}
+type ExecutionsResponse = StandingOrderExecution[];
 
 // ---------------------------------------------------------------------------
 // Helpers
diff --git a/it0-web-admin/src/app/(admin)/tenants/[id]/page.tsx b/it0-web-admin/src/app/(admin)/tenants/[id]/page.tsx
index e135ef5..a4b1717 100644
--- a/it0-web-admin/src/app/(admin)/tenants/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/tenants/[id]/page.tsx
@@ -32,10 +32,7 @@ interface TenantMember {
   joinedAt: string;
 }
 
-interface TenantMembersResponse {
-  data: TenantMember[];
-  total: number;
-}
+type TenantMembersResponse = TenantMember[];
 
 interface TenantInvite {
   id: string;
diff --git a/it0-web-admin/src/app/(admin)/terminal/page.tsx b/it0-web-admin/src/app/(admin)/terminal/page.tsx
index 02aab80..9fca350 100644
--- a/it0-web-admin/src/app/(admin)/terminal/page.tsx
+++ b/it0-web-admin/src/app/(admin)/terminal/page.tsx
@@ -19,10 +19,7 @@ interface Server {
   environment: string;
 }
 
-interface ServersResponse {
-  data: Server[];
-  total: number;
-}
+type ServersResponse = Server[];
 
 interface TerminalLine {
   id: number;
diff --git a/it0-web-admin/src/app/(admin)/users/[id]/page.tsx b/it0-web-admin/src/app/(admin)/users/[id]/page.tsx
index 8bc40fc..791c81e 100644
--- a/it0-web-admin/src/app/(admin)/users/[id]/page.tsx
+++ b/it0-web-admin/src/app/(admin)/users/[id]/page.tsx
@@ -34,10 +34,7 @@ interface ActivityEntry {
   createdAt: string;
 }
 
-interface ActivityResponse {
-  data: ActivityEntry[];
-  total: number;
-}
+type ActivityResponse = ActivityEntry[];
 
 interface EditFormData {
   displayName: string;
diff --git a/it0-web-admin/src/app/(admin)/users/page.tsx b/it0-web-admin/src/app/(admin)/users/page.tsx
index c4c2205..86fc5b9 100644
--- a/it0-web-admin/src/app/(admin)/users/page.tsx
+++ b/it0-web-admin/src/app/(admin)/users/page.tsx
@@ -24,10 +24,7 @@ interface User {
   createdAt: string;
 }
 
-interface UsersResponse {
-  data: User[];
-  total: number;
-}
+type UsersResponse = User[];
 
 interface UserFormData {
   displayName: string;