diff --git a/src/app/haldus/meeskonnad/page.tsx b/src/app/haldus/meeskonnad/page.tsx
index dc89516..b7290f5 100644
--- a/src/app/haldus/meeskonnad/page.tsx
+++ b/src/app/haldus/meeskonnad/page.tsx
@@ -4,13 +4,15 @@ import { vipnagorgialla } from "@/components/Vipnagorgialla";
 // Database
 import { db } from "@/db/drizzle";
 
+// Types
+import type { TeamWithMembers, MemberWithUser } from "@/types/database";
+
 import Link from "next/link";
 
 // User interface
 import {
   Table,
   TableBody,
-  TableCaption,
   TableCell,
   TableHead,
   TableHeader,
@@ -66,14 +68,14 @@ export default async function AdminTeams() {
               </TableRow>
             </TableHeader>
             <TableBody>
-              {teams.map((team: any) => (
+              {teams.map((team: TeamWithMembers) => (
                 <TableRow key={team.id}>
                   <TableCell className="font-medium">{team.id}</TableCell>
                   <TableCell>{team.name}</TableCell>
                   <TableCell>
                     <div className="flex flex-col gap-1">
                       {team.members && team.members.length > 0 ? (
-                        team.members.map((member: any) => (
+                        team.members.map((member: MemberWithUser) => (
                           <div
                             key={member.id}
                             className="flex items-center gap-2 text-sm"
diff --git a/src/db/schema.ts b/src/db/schema.ts
index e15aa98..5783e90 100644
--- a/src/db/schema.ts
+++ b/src/db/schema.ts
@@ -2,7 +2,6 @@ import {
   sqliteTable,
   text,
   integer,
-  primaryKey,
   uniqueIndex,
 } from "drizzle-orm/sqlite-core";
 import { relations } from "drizzle-orm";
diff --git a/src/types/database.ts b/src/types/database.ts
new file mode 100644
index 0000000..7ab8b82
--- /dev/null
+++ b/src/types/database.ts
@@ -0,0 +1,22 @@
+import type { InferSelectModel } from "drizzle-orm";
+import { users, teams, members } from "@/db/schema";
+
+// Base types from schema
+export type User = InferSelectModel<typeof users>;
+export type Team = InferSelectModel<typeof teams>;
+export type Member = InferSelectModel<typeof members>;
+
+// Extended types for queries with relations
+export type TeamWithMembers = Team & {
+  members: (Member & {
+    user: User;
+  })[];
+};
+
+export type MemberWithUser = Member & {
+  user: User;
+};
+
+export type UserWithMembers = User & {
+  members: Member[];
+};