diff --git a/gns3server/api/routes/controller/groups.py b/gns3server/api/routes/controller/groups.py
index 606835419..1b5de02d2 100644
--- a/gns3server/api/routes/controller/groups.py
+++ b/gns3server/api/routes/controller/groups.py
@@ -21,7 +21,7 @@ API routes for user groups.
 
 from fastapi import APIRouter, Depends, status
 from uuid import UUID
-from typing import List
+from typing import List, Optional
 
 from gns3server import schemas
 from gns3server.controller.controller_error import (
@@ -31,6 +31,7 @@ from gns3server.controller.controller_error import (
     ControllerForbiddenError,
 )
 
+import gns3server.db.models as models
 from gns3server.db.repositories.users import UsersRepository
 from gns3server.db.repositories.rbac import RbacRepository
 
@@ -47,7 +48,7 @@ router = APIRouter()
 @router.get("", response_model=List[schemas.UserGroup], dependencies=[Depends(has_privilege("Group.Audit"))])
 async def get_user_groups(
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-) -> List[schemas.UserGroup]:
+) -> List[models.UserGroup]:
     """
     Get all user groups.
 
@@ -65,7 +66,7 @@ async def get_user_groups(
 )
 async def create_user_group(
     user_group_create: schemas.UserGroupCreate, users_repo: UsersRepository = Depends(get_repository(UsersRepository))
-) -> schemas.UserGroup:
+) -> models.UserGroup:
     """
     Create a new user group.
 
@@ -82,7 +83,7 @@ async def create_user_group(
 async def get_user_group(
     user_group_id: UUID,
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-) -> schemas.UserGroup:
+) -> models.UserGroup:
     """
     Get a user group.
 
@@ -100,7 +101,7 @@ async def update_user_group(
     user_group_id: UUID,
     user_group_update: schemas.UserGroupUpdate,
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-) -> schemas.UserGroup:
+) -> Optional[models.UserGroup]:
     """
     Update a user group.
 
@@ -148,7 +149,7 @@ async def delete_user_group(
 )
 async def get_user_group_members(
     user_group_id: UUID, users_repo: UsersRepository = Depends(get_repository(UsersRepository))
-) -> List[schemas.User]:
+) -> List[models.User]:
     """
     Get all user group members.
 
diff --git a/gns3server/schemas/controller/users.py b/gns3server/schemas/controller/users.py
index 4fed51d49..8d8b90c13 100644
--- a/gns3server/schemas/controller/users.py
+++ b/gns3server/schemas/controller/users.py
@@ -80,7 +80,7 @@ class UserGroupCreate(UserGroupBase):
     Properties to create a user group.
     """
 
-    name: Optional[str] = Field(..., min_length=3, pattern="[a-zA-Z0-9_-]+$")
+    name: str = Field(..., min_length=3, pattern="[a-zA-Z0-9_-]+$")
 
 
 class UserGroupUpdate(UserGroupBase):
diff --git a/pyproject.toml b/pyproject.toml
index cc334a895..5fbc2e327 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -341,7 +341,6 @@ module = [
   "gns3server.api.routes.controller.chat",  # 1
   "gns3server.api.routes.controller.dependencies.authentication",  # 11
   "gns3server.api.routes.controller.drawings",  # 1
-  "gns3server.api.routes.controller.groups",  # 6
   "gns3server.api.routes.controller.images",  # 9
   "gns3server.api.routes.controller.llm_model_configs",  # 32
   "gns3server.api.routes.controller.nodes",  # 13