diff --git a/server/api/controllers/access-tokens/delete.js b/server/api/controllers/access-tokens/delete.js
index 17f9b4a4..3ca77f85 100644
--- a/server/api/controllers/access-tokens/delete.js
+++ b/server/api/controllers/access-tokens/delete.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /access-tokens:
+ * /access-tokens/me:
  *   delete:
  *     summary: User logout
  *     description: Logs out the current user by deleting the session and access token. Clears HTTP-only cookies if present.
diff --git a/server/api/controllers/board-memberships/create.js b/server/api/controllers/board-memberships/create.js
index 0db2569b..31b0516c 100755
--- a/server/api/controllers/board-memberships/create.js
+++ b/server/api/controllers/board-memberships/create.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /boards/{boardId}/memberships:
+ * /boards/{boardId}/board-memberships:
  *   post:
  *     summary: Create board membership
  *     description: Creates a board membership within a board. Requires project manager permissions.
diff --git a/server/api/controllers/card-labels/create.js b/server/api/controllers/card-labels/create.js
index 9956eb46..63de7b30 100755
--- a/server/api/controllers/card-labels/create.js
+++ b/server/api/controllers/card-labels/create.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /cards/{cardId}/labels:
+ * /cards/{cardId}/card-labels:
  *   post:
  *     summary: Add label to card
  *     description: Adds a label to a card. Requires board editor permissions.
diff --git a/server/api/controllers/card-labels/delete.js b/server/api/controllers/card-labels/delete.js
index d0392bc7..53d1faf7 100755
--- a/server/api/controllers/card-labels/delete.js
+++ b/server/api/controllers/card-labels/delete.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /cards/{cardId}/labels/{labelId}:
+ * /cards/{cardId}/card-labels/labelId:{labelId}:
  *   delete:
  *     summary: Remove label from card
  *     description: Removes a label from a card. Requires board editor permissions.
diff --git a/server/api/controllers/card-memberships/create.js b/server/api/controllers/card-memberships/create.js
index 362752b9..34d79308 100755
--- a/server/api/controllers/card-memberships/create.js
+++ b/server/api/controllers/card-memberships/create.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /cards/{cardId}/memberships:
+ * /cards/{cardId}/card-memberships:
  *   post:
  *     summary: Add user to card
  *     description: Adds a user to a card. Requires board editor permissions.
diff --git a/server/api/controllers/card-memberships/delete.js b/server/api/controllers/card-memberships/delete.js
index e36b5f73..d32bc4eb 100755
--- a/server/api/controllers/card-memberships/delete.js
+++ b/server/api/controllers/card-memberships/delete.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /cards/{cardId}/memberships/{userId}:
+ * /cards/{cardId}/card-memberships/userId:{userId}:
  *   delete:
  *     summary: Remove user from card
  *     description: Removes a user from a card. Requires board editor permissions.
diff --git a/server/api/controllers/custom-field-values/create-or-update.js b/server/api/controllers/custom-field-values/create-or-update.js
index d9b44754..07fcfa53 100644
--- a/server/api/controllers/custom-field-values/create-or-update.js
+++ b/server/api/controllers/custom-field-values/create-or-update.js
@@ -5,8 +5,8 @@
 
 /**
  * @swagger
- * /cards/{cardId}/custom-field-values:
- *   post:
+ * /cards/{cardId}/custom-field-values/customFieldGroupId:{customFieldGroupId}:customFieldId:${customFieldId}:
+ *   patch:
  *     summary: Create or update custom field value
  *     description: Creates or updates a custom field value for a card. Requires board editor permissions.
  *     tags:
@@ -20,6 +20,20 @@
  *         schema:
  *           type: string
  *           example: "1357158568008091264"
+ *       - name: customFieldGroupId
+ *         in: path
+ *         required: true
+ *         description: ID of the custom field group the value belongs to
+ *         schema:
+ *           type: string
+ *           example: "1357158568008091265"
+ *       - name: customFieldId
+ *         in: path
+ *         required: true
+ *         description: ID of the custom field the value belongs to
+ *         schema:
+ *           type: string
+ *           example: "1357158568008091266"
  *     requestBody:
  *       required: true
  *       content:
@@ -27,18 +41,8 @@
  *           schema:
  *             type: object
  *             required:
- *               - customFieldGroupId
- *               - customFieldId
  *               - content
  *             properties:
- *               customFieldGroupId:
- *                 type: string
- *                 description: ID of the custom field group the value belongs to
- *                 example: "1357158568008091265"
- *               customFieldId:
- *                 type: string
- *                 description: ID of the custom field the value belongs to
- *                 example: "1357158568008091266"
  *               content:
  *                 type: string
  *                 maxLength: 512
diff --git a/server/api/controllers/custom-field-values/delete.js b/server/api/controllers/custom-field-values/delete.js
index a3794019..3c292e0c 100644
--- a/server/api/controllers/custom-field-values/delete.js
+++ b/server/api/controllers/custom-field-values/delete.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /cards/{cardId}/custom-field-groups/{customFieldGroupId}/custom-fields/{customFieldId}/value:
+ * /cards/{cardId}/custom-field-value/customFieldGroupId:{customFieldGroupId}:customFieldId:${customFieldId}:
  *   delete:
  *     summary: Delete custom field value
  *     description: Deletes a custom field value for a specific card. Requires board editor permissions.
diff --git a/server/api/controllers/project-managers/create.js b/server/api/controllers/project-managers/create.js
index 1bbc9b3a..abbb3d49 100755
--- a/server/api/controllers/project-managers/create.js
+++ b/server/api/controllers/project-managers/create.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /projects/{projectId}/managers:
+ * /projects/{projectId}/project-managers:
  *   post:
  *     summary: Create project manager
  *     description: Creates a project manager within a project. Requires admin privileges for shared projects or existing project manager permissions. The user must be an admin or project owner.
diff --git a/server/api/controllers/terms/show.js b/server/api/controllers/terms/show.js
index 812fe7d9..dad8fd52 100644
--- a/server/api/controllers/terms/show.js
+++ b/server/api/controllers/terms/show.js
@@ -5,7 +5,7 @@
 
 /**
  * @swagger
- * /terms:
+ * /terms/{type}:
  *   get:
  *     summary: Get terms and conditions
  *     description: Retrieves terms and conditions in the specified language.
@@ -14,7 +14,7 @@
  *     operationId: getTerms
  *     parameters:
  *       - name: type
- *         in: query
+ *         in: path
  *         required: true
  *         description: Type of terms to retrieve
  *         schema:
diff --git a/server/api/controllers/users/update-avatar.js b/server/api/controllers/users/update-avatar.js
index e2460f29..7c6f3c69 100755
--- a/server/api/controllers/users/update-avatar.js
+++ b/server/api/controllers/users/update-avatar.js
@@ -6,7 +6,7 @@
 /**
  * @swagger
  * /users/{id}/avatar:
- *   patch:
+ *   post:
  *     summary: Update user avatar
  *     description: Updates a user's avatar image. Users can update their own avatar, admins can update any user's avatar.
  *     tags:
diff --git a/server/config/swagger.js b/server/config/swagger.js
index 3717f3d3..cc622ab9 100644
--- a/server/config/swagger.js
+++ b/server/config/swagger.js
@@ -12,7 +12,7 @@ module.exports = {
       version,
       title: 'PLANKA API',
       description:
-        'API documentation for PLANKA - Real-time Collaborative Kanban Board Application',
+        'API documentation for PLANKA - Real-Time Collaborative Kanban Board Application',
       license: {
         name: 'Fair Use License',
         url: 'https://github.com/plankanban/planka/blob/master/LICENSE.md',