diff --git a/apps/api/.eslintrc.js b/apps/api/.eslintrc.js
index c87cec448..1504dfd48 100644
--- a/apps/api/.eslintrc.js
+++ b/apps/api/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
     tsconfigRootDir: __dirname,
     sourceType: "module",
   },
-  plugins: ["@typescript-eslint", "import"],
+  plugins: ["@typescript-eslint", "import", "unused-imports"],
   extends: ["plugin:@typescript-eslint/recommended", "plugin:import/typescript"],
   root: true,
   env: {
@@ -20,7 +20,7 @@ module.exports = {
     },
   },
   rules: {
-    "import/no-duplicates": "error",
+    "import/no-duplicates": ["error", { considerQueryString: true }],
     "import/order": [
       "error",
       {
@@ -49,5 +49,7 @@ module.exports = {
       "error",
       { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
     ],
+    "@typescript-eslint/no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
   },
 };
diff --git a/apps/api/package.json b/apps/api/package.json
index cb651ed86..ebf7cdd85 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -97,6 +97,7 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
     "fishery": "^2.2.2",
     "jest": "^29.5.0",
     "prettier": "^3.0.0",
diff --git a/apps/api/src/courses/courses.service.ts b/apps/api/src/courses/courses.service.ts
index e86100f80..ca7e80560 100644
--- a/apps/api/src/courses/courses.service.ts
+++ b/apps/api/src/courses/courses.service.ts
@@ -295,6 +295,13 @@ export class CoursesService {
         authorId: courses.authorId,
         author: sql<string>`${users.firstName} || ' ' || ${users.lastName}`,
         authorEmail: sql<string>`${users.email}`,
+        hasFreeLessons: sql<boolean>`
+        EXISTS (
+          SELECT 1
+          FROM ${courseLessons}
+          WHERE ${courseLessons.courseId} = ${courses.id}
+            AND ${courseLessons.isFree} = true
+        )`,
       })
       .from(courses)
       .innerJoin(categories, eq(courses.categoryId, categories.id))
@@ -303,6 +310,7 @@ export class CoursesService {
         studentCourses,
         and(eq(courses.id, studentCourses.courseId), eq(studentCourses.studentId, userId)),
       )
+      .leftJoin(courseLessons, eq(courses.id, courseLessons.courseId))
       .where(and(eq(courses.id, id), eq(courses.archived, false)));
 
     if (!course) throw new NotFoundException("Course not found");
@@ -360,6 +368,7 @@ export class CoursesService {
             ELSE ${LessonProgress.notStarted}
           END)
         `,
+        isFree: courseLessons.isFree,
       })
       .from(courseLessons)
       .innerJoin(lessons, eq(courseLessons.lessonId, lessons.id))
@@ -424,6 +433,7 @@ export class CoursesService {
           (SELECT COUNT(*)
           FROM ${lessonItems}
           WHERE ${lessonItems.lessonId} = ${lessons.id} AND ${lessonItems.lessonItemType} != 'text_block')::INTEGER`,
+        isFree: courseLessons.isFree,
       })
       .from(courseLessons)
       .innerJoin(lessons, eq(courseLessons.lessonId, lessons.id))
@@ -777,6 +787,13 @@ export class CoursesService {
         )::INTEGER`,
       priceInCents: courses.priceInCents,
       currency: courses.currency,
+      hasFreeLessons: sql<boolean>`
+        EXISTS (
+          SELECT 1
+          FROM ${courseLessons}
+          WHERE ${courseLessons.courseId} = ${courses.id}
+            AND ${courseLessons.isFree} = true
+        )`,
     };
   }
 
diff --git a/apps/api/src/courses/schemas/course.schema.ts b/apps/api/src/courses/schemas/course.schema.ts
index 3d655684b..73261d749 100644
--- a/apps/api/src/courses/schemas/course.schema.ts
+++ b/apps/api/src/courses/schemas/course.schema.ts
@@ -20,6 +20,7 @@ export const courseSchema = Type.Object({
   state: Type.Optional(Type.String()),
   archived: Type.Optional(Type.Boolean()),
   createdAt: Type.Optional(Type.String()),
+  hasFreeLessons: Type.Optional(Type.Boolean()),
 });
 
 export const allCoursesSchema = Type.Array(courseSchema);
diff --git a/apps/api/src/courses/schemas/showCourseCommon.schema.ts b/apps/api/src/courses/schemas/showCourseCommon.schema.ts
index 15ffe30a5..51ab75442 100644
--- a/apps/api/src/courses/schemas/showCourseCommon.schema.ts
+++ b/apps/api/src/courses/schemas/showCourseCommon.schema.ts
@@ -22,6 +22,7 @@ export const commonShowCourseSchema = Type.Object({
   priceInCents: Type.Number(),
   currency: Type.String(),
   archived: Type.Optional(Type.Boolean()),
+  hasFreeLessons: Type.Optional(Type.Boolean()),
 });
 
 export type CommonShowCourse = Static<typeof commonShowCourseSchema>;
diff --git a/apps/api/src/e2e-data-seeds.ts b/apps/api/src/e2e-data-seeds.ts
index d478aa984..1bce949a5 100644
--- a/apps/api/src/e2e-data-seeds.ts
+++ b/apps/api/src/e2e-data-seeds.ts
@@ -19,6 +19,7 @@ export const e2eCourses: NiceCourseData[] = [
         imageUrl: "https://placehold.co/600x400",
         type: LESSON_TYPE.multimedia.key,
         state: STATUS.published.key,
+        isFree: false,
         items: [
           {
             itemType: LESSON_ITEM_TYPE.text_block.key,
diff --git a/apps/api/src/lessons/adminLessons.service.ts b/apps/api/src/lessons/adminLessons.service.ts
index a73f5b448..0a0dadc91 100644
--- a/apps/api/src/lessons/adminLessons.service.ts
+++ b/apps/api/src/lessons/adminLessons.service.ts
@@ -19,6 +19,7 @@ import {
 
 import type { CreateLessonBody, UpdateLessonBody } from "./schemas/lesson.schema";
 import type { LessonItemResponse } from "./schemas/lessonItem.schema";
+import type { UUIDType } from "src/common";
 
 interface LessonsQuery {
   filters?: LessonsFilterSchema;
@@ -136,8 +137,8 @@ export class AdminLessonsService {
     };
   }
 
-  async getAvailableLessons() {
-    const availableLessons = await this.adminLessonsRepository.getAvailableLessons();
+  async getAvailableLessons(courseId: UUIDType) {
+    const availableLessons = await this.adminLessonsRepository.getAvailableLessons(courseId);
 
     if (isEmpty(availableLessons)) throw new NotFoundException("Lessons not found");
 
@@ -169,6 +170,10 @@ export class AdminLessonsService {
     if (!lesson) throw new NotFoundException("Lesson not found");
   }
 
+  async toggleLessonAsFree(courseId: UUIDType, lessonId: UUIDType, isFree: boolean) {
+    return await this.adminLessonsRepository.toggleLessonAsFree(courseId, lessonId, isFree);
+  }
+
   async addLessonToCourse(courseId: string, lessonId: string, displayOrder?: number) {
     try {
       if (displayOrder === undefined) {
diff --git a/apps/api/src/lessons/api/lessons.controller.ts b/apps/api/src/lessons/api/lessons.controller.ts
index e22faa737..2b01f9aaa 100644
--- a/apps/api/src/lessons/api/lessons.controller.ts
+++ b/apps/api/src/lessons/api/lessons.controller.ts
@@ -31,31 +31,33 @@ import { LessonsService } from "../lessons.service";
 import {
   type AllLessonsResponse,
   allLessonsSchema,
-  type CreateLessonBody,
   createLessonSchema,
-  type ShowLessonResponse,
+  lessonWithCountItems,
   showLessonSchema,
-  type UpdateLessonBody,
   updateLessonSchema,
+  type CreateLessonBody,
+  type ShowLessonResponse,
+  type UpdateLessonBody,
+  type LessonWithCountItems,
 } from "../schemas/lesson.schema";
 import {
-  type FileInsertType,
   fileUpdateSchema,
-  type GetAllLessonItemsResponse,
   GetAllLessonItemsResponseSchema,
-  type GetSingleLessonItemsResponse,
   GetSingleLessonItemsResponseSchema,
-  type QuestionInsertType,
   questionUpdateSchema,
-  type TextBlockInsertType,
   textBlockUpdateSchema,
+  type FileInsertType,
+  type GetAllLessonItemsResponse,
+  type GetSingleLessonItemsResponse,
+  type QuestionInsertType,
+  type TextBlockInsertType,
   type UpdateFileBody,
   type UpdateQuestionBody,
   type UpdateTextBlockBody,
 } from "../schemas/lessonItem.schema";
 import {
-  type LessonsFilterSchema,
   sortLessonFieldsOptions,
+  type LessonsFilterSchema,
   type SortLessonFieldsOptions,
 } from "../schemas/lessonQuery";
 
@@ -103,30 +105,13 @@ export class LessonsController {
   @Get("available-lessons")
   @Roles(USER_ROLES.tutor, USER_ROLES.admin)
   @Validate({
-    response: baseResponse(
-      Type.Array(
-        Type.Object({
-          id: Type.String(),
-          title: Type.String(),
-          description: Type.String(),
-          imageUrl: Type.String(),
-          itemsCount: Type.Number(),
-        }),
-      ),
-    ),
+    request: [{ type: "query", name: "courseId", schema: UUIDSchema, required: true }],
+    response: baseResponse(Type.Array(lessonWithCountItems)),
   })
-  async getAvailableLessons(): Promise<
-    BaseResponse<
-      Array<{
-        id: string;
-        title: string;
-        description: string;
-        imageUrl: string;
-        itemsCount: number;
-      }>
-    >
-  > {
-    const availableLessons = await this.adminLessonsService.getAvailableLessons();
+  async getAvailableLessons(
+    @Query("courseId") courseId: UUIDType,
+  ): Promise<BaseResponse<Array<LessonWithCountItems>>> {
+    const availableLessons = await this.adminLessonsService.getAvailableLessons(courseId);
     return new BaseResponse(availableLessons);
   }
 
@@ -151,7 +136,7 @@ export class LessonsController {
   }
 
   @Get("lesson/:id")
-  @Roles(...Object.values(USER_ROLES))
+  @Roles(USER_ROLES.tutor, USER_ROLES.admin)
   @Validate({
     response: baseResponse(showLessonSchema),
   })
@@ -248,6 +233,37 @@ export class LessonsController {
     });
   }
 
+  @Patch("course-lesson")
+  @Roles(USER_ROLES.tutor, USER_ROLES.admin)
+  @Validate({
+    request: [
+      {
+        type: "body",
+        schema: Type.Object({
+          courseId: UUIDSchema,
+          lessonId: UUIDSchema,
+          isFree: Type.Boolean(),
+        }),
+      },
+    ],
+    response: baseResponse(Type.Object({ isFree: Type.Boolean(), message: Type.String() })),
+  })
+  async toggleLessonAsFree(
+    @Body() body: { courseId: string; lessonId: string; isFree: boolean },
+  ): Promise<BaseResponse<{ isFree: boolean; message: string }>> {
+    const [toggledLesson] = await this.adminLessonsService.toggleLessonAsFree(
+      body.courseId,
+      body.lessonId,
+      body.isFree,
+    );
+    return new BaseResponse({
+      isFree: toggledLesson.isFree,
+      message: body.isFree
+        ? "Lesson toggled as free successfully"
+        : "Lesson toggled as not free successfully",
+    });
+  }
+
   @Post("evaluation-quiz")
   @Roles(USER_ROLES.student)
   @Validate({
diff --git a/apps/api/src/lessons/lessons.service.ts b/apps/api/src/lessons/lessons.service.ts
index 6f63d375d..74750c123 100644
--- a/apps/api/src/lessons/lessons.service.ts
+++ b/apps/api/src/lessons/lessons.service.ts
@@ -38,12 +38,11 @@ export class LessonsService {
       id,
       userId,
     );
+    const lesson = await this.lessonsRepository.getLessonForUser(courseId, id, userId);
 
-    if (!isAdmin && !accessCourseLessons)
+    if (!isAdmin && !accessCourseLessons && !lesson.isFree)
       throw new UnauthorizedException("You don't have access to this lesson");
 
-    const lesson = await this.lessonsRepository.getLessonForUser(courseId, id, userId);
-
     if (!lesson) throw new NotFoundException("Lesson not found");
 
     const getImageUrl = async (url: string) => {
@@ -82,24 +81,30 @@ export class LessonsService {
 
     const lessonProgress = await this.lessonsRepository.lessonProgress(courseId, lesson.id, userId);
 
-    if (!lessonProgress) throw new NotFoundException("Lesson progress not found");
+    if (!lessonProgress && !isAdmin && !lesson.isFree)
+      throw new NotFoundException("Lesson progress not found");
+
+    const isAdminOrFreeLessonWithoutLessonProgress = (isAdmin || lesson.isFree) && !lessonProgress;
 
     const questionLessonItems = await this.getLessonQuestions(
       lesson,
       courseId,
       userId,
-      lessonProgress.quizCompleted,
+      isAdminOrFreeLessonWithoutLessonProgress ? false : lessonProgress.quizCompleted,
     );
 
     return {
       ...lesson,
       imageUrl,
       lessonItems: questionLessonItems,
-      itemsCount: lessonProgress.lessonItemCount,
-      itemsCompletedCount: lessonProgress.completedLessonItemCount,
-      quizScore: lessonProgress.quizScore,
-      lessonProgress:
-        lessonProgress.completedLessonItemCount === 0
+      itemsCount: isAdminOrFreeLessonWithoutLessonProgress ? 0 : lessonProgress.lessonItemCount,
+      itemsCompletedCount: isAdminOrFreeLessonWithoutLessonProgress
+        ? 0
+        : lessonProgress.completedLessonItemCount,
+      quizScore: isAdminOrFreeLessonWithoutLessonProgress ? 0 : lessonProgress.quizScore,
+      lessonProgress: isAdminOrFreeLessonWithoutLessonProgress
+        ? LessonProgress.notStarted
+        : lessonProgress.completedLessonItemCount === 0
           ? LessonProgress.notStarted
           : lessonProgress.completedLessonItemCount > 0
             ? LessonProgress.inProgress
@@ -114,12 +119,12 @@ export class LessonsService {
       userId,
     );
 
-    if (!accessCourseLessons)
+    if (!accessCourseLessons.isAssigned && !accessCourseLessons.isFree)
       throw new UnauthorizedException("You don't have assignment to this lesson");
 
     const quizProgress = await this.lessonsRepository.getQuizProgress(courseId, lessonId, userId);
 
-    if (quizProgress.quizCompleted) throw new ConflictException("Quiz already completed");
+    if (quizProgress?.quizCompleted) throw new ConflictException("Quiz already completed");
 
     const lessonItemsCount = await this.lessonsRepository.getLessonItemCount(lessonId);
 
diff --git a/apps/api/src/lessons/repositories/adminLessons.repository.ts b/apps/api/src/lessons/repositories/adminLessons.repository.ts
index ff6d474ca..f9c29b681 100644
--- a/apps/api/src/lessons/repositories/adminLessons.repository.ts
+++ b/apps/api/src/lessons/repositories/adminLessons.repository.ts
@@ -54,7 +54,7 @@ export class AdminLessonsRepository {
     return lesson;
   }
 
-  async getAvailableLessons() {
+  async getAvailableLessons(courseId: UUIDType) {
     return await this.db
       .select({
         id: lessons.id,
@@ -65,8 +65,13 @@ export class AdminLessonsRepository {
         (SELECT COUNT(*)
         FROM ${lessonItems}
         WHERE ${lessonItems.lessonId} = ${lessons.id} AND ${lessonItems.lessonItemType} != 'text_block')::INTEGER`,
+        isFree: sql<boolean>`COALESCE(${courseLessons.isFree}, false)`,
       })
       .from(lessons)
+      .leftJoin(
+        courseLessons,
+        and(eq(courseLessons.lessonId, lessons.id), eq(courseLessons.courseId, courseId)),
+      )
       .where(
         and(
           eq(lessons.archived, false),
@@ -167,6 +172,14 @@ export class AdminLessonsRepository {
     });
   }
 
+  async toggleLessonAsFree(courseId: UUIDType, lessonId: UUIDType, isFree: boolean) {
+    return await this.db
+      .update(courseLessons)
+      .set({ isFree })
+      .where(and(eq(courseLessons.lessonId, lessonId), eq(courseLessons.courseId, courseId)))
+      .returning();
+  }
+
   async createLesson(body: CreateLessonBody, authorId: string) {
     return await this.db
       .insert(lessons)
diff --git a/apps/api/src/lessons/repositories/lessons.repository.ts b/apps/api/src/lessons/repositories/lessons.repository.ts
index d744f1bc6..0bf84ff19 100644
--- a/apps/api/src/lessons/repositories/lessons.repository.ts
+++ b/apps/api/src/lessons/repositories/lessons.repository.ts
@@ -41,8 +41,14 @@ export class LessonsRepository {
             ELSE FALSE
           END
         `,
+        isFree: courseLessons.isFree,
+        enrolled: sql<boolean>`CASE WHEN ${studentCourses.id} IS NOT NULL THEN true ELSE false END`,
       })
       .from(lessons)
+      .innerJoin(
+        courseLessons,
+        and(eq(courseLessons.lessonId, lessons.id), eq(courseLessons.courseId, courseId)),
+      )
       .leftJoin(
         studentLessonsProgress,
         and(
@@ -51,6 +57,10 @@ export class LessonsRepository {
           eq(studentLessonsProgress.studentId, userId),
         ),
       )
+      .leftJoin(
+        studentCourses,
+        and(eq(studentCourses.courseId, courseId), eq(studentCourses.studentId, userId)),
+      )
       .where(
         and(
           eq(lessons.id, lessonId),
@@ -207,17 +217,20 @@ export class LessonsRepository {
     return this.db
       .select({
         id: lessons.id,
-        studentCourseId: studentCourses.id,
+        isFree: sql<boolean>`COALESCE(${courseLessons.isFree}, FALSE)`,
+        isAssigned: sql<boolean>`CASE WHEN ${studentCourses.id} IS NOT NULL THEN true ELSE false END`,
       })
       .from(lessons)
-      .leftJoin(courseLessons, eq(courseLessons.lessonId, lessons.id))
+      .leftJoin(
+        courseLessons,
+        and(eq(courseLessons.lessonId, lessons.id), eq(courseLessons.courseId, courseId)),
+      )
       .leftJoin(
         studentCourses,
         and(eq(studentCourses.courseId, courseId), eq(studentCourses.studentId, userId)),
       )
       .where(
         and(
-          eq(studentCourses.courseId, courseId),
           eq(lessons.archived, false),
           eq(lessons.id, lessonId),
           eq(lessons.state, STATES.published),
@@ -524,4 +537,20 @@ export class LessonsRepository {
         ),
       );
   }
+
+  async createLessonProgress(
+    courseId: UUIDType,
+    lessonId: UUIDType,
+    userId: UUIDType,
+    lessonItemCount: number,
+  ) {
+    return await this.db.insert(studentLessonsProgress).values({
+      studentId: userId,
+      lessonId,
+      courseId,
+      quizCompleted: false,
+      lessonItemCount,
+      completedLessonItemCount: 0,
+    });
+  }
 }
diff --git a/apps/api/src/lessons/schemas/lesson.schema.ts b/apps/api/src/lessons/schemas/lesson.schema.ts
index 2db460656..cc066b4ab 100644
--- a/apps/api/src/lessons/schemas/lesson.schema.ts
+++ b/apps/api/src/lessons/schemas/lesson.schema.ts
@@ -19,6 +19,8 @@ export const lessonSchema = Type.Object({
       Type.Literal(LessonProgress.notStarted),
     ]),
   ),
+  isFree: Type.Optional(Type.Boolean()),
+  enrolled: Type.Optional(Type.Boolean()),
   state: Type.Optional(Type.String()),
   archived: Type.Optional(Type.Boolean()),
   isSubmitted: Type.Optional(Type.Boolean()),
@@ -41,8 +43,16 @@ export const lesson = Type.Object({
   imageUrl: Type.String(),
   description: Type.String(),
   type: Type.String(),
+  isFree: Type.Boolean(),
 });
 
+export const lessonWithCountItems = Type.Intersect([
+  Type.Omit(lesson, ["type"]),
+  Type.Object({
+    itemsCount: Type.Number(),
+  }),
+]);
+
 export const allLessonsSchema = Type.Array(lessonSchema);
 
 export const showLessonSchema = Type.Object({
@@ -60,6 +70,7 @@ export const showLessonSchema = Type.Object({
 });
 
 export type Lesson = Static<typeof lesson>;
+export type LessonWithCountItems = Static<typeof lessonWithCountItems>;
 export type LessonResponse = Static<typeof lessonSchema>;
 export type ShowLessonResponse = Static<typeof showLessonSchema>;
 export type AllLessonsResponse = Static<typeof allLessonsSchema>;
diff --git a/apps/api/src/nice-data-seeds.ts b/apps/api/src/nice-data-seeds.ts
index 527a295a4..805caf922 100644
--- a/apps/api/src/nice-data-seeds.ts
+++ b/apps/api/src/nice-data-seeds.ts
@@ -24,6 +24,7 @@ export const niceCourses: NiceCourseData[] = [
           "In this lesson, you will learn how to use HTML to create the basic structure of a website. We'll cover common HTML elements such as headings, paragraphs, links, and images, helping you understand how to build a solid foundation for your web pages.",
         state: STATUS.published.key,
         imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: false,
         items: [
           {
             itemType: LESSON_ITEM_TYPE.text_block.key,
@@ -64,6 +65,16 @@ export const niceCourses: NiceCourseData[] = [
                 isCorrect: true,
                 position: 1,
               },
+              {
+                optionText: "grid",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "flex",
+                isCorrect: false,
+                position: 3,
+              },
             ],
           },
           {
@@ -246,6 +257,150 @@ export const niceCourses: NiceCourseData[] = [
           "This lesson is designed to test your understanding of basic HTML concepts. You'll encounter a mix of multiple-choice and single-answer questions to evaluate your knowledge of HTML structure and common elements.",
         state: STATUS.published.key,
         imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: false,
+        items: [
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which of the following HTML tags is used to create an image?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "<img>",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "<picture>",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "<video>",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "<audio>",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody:
+              "Which of the following are valid HTML elements for structuring content? (Select all that apply)",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "<html>",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "<head>",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "<body>",
+                isCorrect: true,
+                position: 2,
+              },
+              {
+                optionText: "<title>",
+                isCorrect: true,
+                position: 3,
+              },
+              {
+                optionText: "<h1>",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "<p>",
+                isCorrect: false,
+                position: 5,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which HTML tag is used to create a hyperlink?",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody:
+              "Which of the following attributes are commonly used with the &lt;img&gt; tag? (Select all that apply)",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "alt",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "src",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "width",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "height",
+                isCorrect: false,
+                position: 3,
+              },
+              {
+                optionText: "srcset",
+                isCorrect: false,
+                position: 4,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_dnd.key,
+            questionBody:
+              "CSS is used to style [word], while JavaScript is used to add [word] to web pages.",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In CSS, [word] is used to style the layout, while [word] is used to change colors.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In CSS, <strong>flexbox</strong> is used to style the layout, while <strong>color properties</strong> are used to change colors.</p>",
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In JavaScript, [word] are used to store data, while [word] are used to perform actions.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In JavaScript, <strong>variables</strong> are used to store data, while <strong>functions</strong> are used to perform actions.</p>",
+          },
+        ],
+      },
+      {
+        type: LESSON_TYPE.quiz.key,
+        title: "HTML Basics: Test Your Knowledge",
+        description:
+          "This lesson is designed to test your understanding of basic HTML concepts. You'll encounter a mix of multiple-choice and single-answer questions to evaluate your knowledge of HTML structure and common elements.",
+        state: STATUS.published.key,
+        imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: false,
         items: [
           {
             itemType: LESSON_ITEM_TYPE.question.key,
@@ -360,6 +515,45 @@ export const niceCourses: NiceCourseData[] = [
             questionBody:
               "CSS is used to style [word], while JavaScript is used to add [word] to web pages.",
             state: STATUS.published.key,
+            solutionExplanation:
+              "<p>CSS is used to style <strong>HTML</strong>, while JavaScript is used to add <strong>interactivity</strong> to web pages.</p>",
+            questionAnswers: [
+              {
+                optionText: "HTML",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "interactivity",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "styles",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "functions",
+                isCorrect: false,
+                position: 3,
+              },
+              {
+                optionText: "content",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "elements",
+                isCorrect: false,
+                position: 5,
+              },
+              {
+                optionText: "animations",
+                isCorrect: false,
+                position: 6,
+              },
+            ],
           },
           {
             itemType: LESSON_ITEM_TYPE.question.key,
@@ -381,6 +575,602 @@ export const niceCourses: NiceCourseData[] = [
           },
         ],
       },
+      {
+        type: LESSON_TYPE.quiz.key,
+        title: "CSS Fundamentals: Put Your Skills to the Test",
+        description:
+          "This lesson is a comprehensive quiz to evaluate your understanding of CSS fundamentals. You'll face a variety of question types covering selectors, properties, and layout techniques.",
+        state: STATUS.published.key,
+        imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: true,
+        items: [
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which CSS property is used to change the text color of an element?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "color",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "text-color",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "font-color",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "text-style",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody: "Which of the following are valid CSS selectors? (Select all that apply)",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: ".class-name",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "#id-name",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "element",
+                isCorrect: true,
+                position: 2,
+              },
+              {
+                optionText: "[attribute]",
+                isCorrect: true,
+                position: 3,
+              },
+              {
+                optionText: "$variable",
+                isCorrect: false,
+                position: 4,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_dnd.key,
+            questionBody:
+              "The CSS [word] property is used for creating flexible box layouts, while [word] is used for creating grid layouts.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>The CSS <strong>flexbox</strong> property is used for creating flexible box layouts, while <strong>color properties</strong> are used for creating grid layouts.</p>",
+            questionAnswers: [
+              {
+                optionText: "flexbox",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "color properties",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "grid",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "flex",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "To center an element horizontally, you can use 'margin: [word] [word];'.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>To center an element horizontally, you can use 'margin: <strong>0 auto</strong>;'.</p>",
+          },
+        ],
+      },
+      {
+        type: LESSON_TYPE.multimedia.key,
+        title: "JavaScript Basics: Interactive Learning",
+        description:
+          "This multimedia lesson introduces you to JavaScript basics through a combination of video tutorials, interactive code examples, and hands-on exercises.",
+        state: STATUS.published.key,
+        imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: true,
+        items: [
+          {
+            itemType: LESSON_ITEM_TYPE.file.key,
+            type: LESSON_FILE_TYPE.external_video.key,
+            url: "https://example.com/javascript-intro-video",
+            title: "Introduction to JavaScript",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.open_answer.key,
+            questionBody:
+              "Your First JavaScript Function // Write a function to add two numbers\nfunction add(a, b) {\n  // Your code here\n}",
+            solutionExplanation: "function add(a, b) {\n  return a + b;\n}",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.file.key,
+            url: "https://example.com/javascript-data-types-image",
+            title: "JavaScript Data Types Overview",
+            state: STATUS.published.key,
+            type: LESSON_FILE_TYPE.presentation.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which keyword is used to declare a variable in modern JavaScript?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "let",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "var",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "const",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "variable",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    title: "Mobile App Development: Creating Your First Android App",
+    description:
+      "Dive into the world of mobile app development with this beginner-friendly course. You'll learn the fundamentals of Android app development using Java and Android Studio. By the end of the course, you'll have created your own simple Android app and gained essential skills for future mobile development projects.",
+    state: STATUS.published.key,
+    priceInCents: 0,
+    category: "Mobile Development",
+    imageUrl: faker.image.urlPicsumPhotos(),
+    lessons: [
+      {
+        type: LESSON_TYPE.multimedia.key,
+        title: "Java Basics: Building Blocks of Android Development",
+        description:
+          "This lesson introduces you to Java programming fundamentals essential for Android development. We'll cover basic syntax, object-oriented programming concepts, and how Java is used in Android app creation.",
+        state: STATUS.published.key,
+        imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: false,
+        items: [
+          {
+            itemType: LESSON_ITEM_TYPE.text_block.key,
+            title: "Introduction to Java for Android",
+            body: "Java is the primary language used for Android app development. In this lesson, you'll learn about Java syntax, data types, and object-oriented programming principles that form the foundation of Android development.",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.open_answer.key,
+            questionBody:
+              "Explain why Java is the preferred language for Android development and list two key features that make it suitable for mobile app creation.",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.file.key,
+            title: "Java Basics Video Tutorial",
+            type: LESSON_FILE_TYPE.external_video.key,
+            url: "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In Java, [word] are used to define the blueprint of objects, while [word] are instances of these blueprints.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In Java, <strong>classes</strong> are used to define the blueprint of objects, while <strong>objects</strong> are instances of these blueprints.</p>",
+            questionAnswers: [
+              {
+                optionText: "classes",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "objects",
+                isCorrect: true,
+                position: 1,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In Android development, [word] are used to define the user interface, while [word] handle user interactions and app logic.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In Android development, <strong>layouts</strong> are used to define the user interface, while <strong>activities</strong> handle user interactions and app logic.</p>",
+            questionAnswers: [
+              {
+                optionText: "layouts",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "activities",
+                isCorrect: true,
+                position: 1,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_dnd.key,
+            questionBody:
+              "Java uses [word] to handle errors, while Android Studio provides [word] for efficient code writing and debugging.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>Java uses <strong>exceptions</strong> to handle errors, while Android Studio provides <strong>tools</strong> for efficient code writing and debugging.</p>",
+            questionAnswers: [
+              {
+                optionText: "exceptions",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "tools",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "debuggers",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "libraries",
+                isCorrect: false,
+                position: 3,
+              },
+              {
+                optionText: "frameworks",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "emulators",
+                isCorrect: false,
+                position: 5,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.file.key,
+            title: "Java OOP Concepts Presentation",
+            type: LESSON_FILE_TYPE.external_presentation.key,
+            url: "https://res.cloudinary.com/dinpapxzv/raw/upload/v1727104719/presentation_gp0o3d.pptx",
+            state: STATUS.published.key,
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which keyword is used to create a new instance of a class in Java?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "new",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "create",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "instance",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "object",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody:
+              "Which of the following are core principles of Object-Oriented Programming in Java? Select all that apply.",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "Encapsulation",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Inheritance",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "Polymorphism",
+                isCorrect: true,
+                position: 2,
+              },
+              {
+                optionText: "Abstraction",
+                isCorrect: true,
+                position: 3,
+              },
+              {
+                optionText: "Compilation",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "Interpretation",
+                isCorrect: false,
+                position: 5,
+              },
+            ],
+          },
+        ],
+      },
+      {
+        type: LESSON_TYPE.quiz.key,
+        title: "Android Development Basics: Test Your Knowledge",
+        description:
+          "This quiz is designed to test your understanding of Android development fundamentals. You'll encounter a variety of questions covering Java basics, Android components, and app structure.",
+        state: STATUS.published.key,
+        imageUrl: faker.image.urlPicsumPhotos(),
+        isFree: false,
+        items: [
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody: "Which of the following is the entry point of an Android application?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "Activity",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Service",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "BroadcastReceiver",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "ContentProvider",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody:
+              "Which of the following are valid Android app components? (Select all that apply)",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "Activity",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Service",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "BroadcastReceiver",
+                isCorrect: true,
+                position: 2,
+              },
+              {
+                optionText: "ContentProvider",
+                isCorrect: true,
+                position: 3,
+              },
+              {
+                optionText: "Fragment",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "Intent",
+                isCorrect: false,
+                position: 5,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.single_choice.key,
+            questionBody:
+              "Which file in an Android project defines the app's structure and components?",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "AndroidManifest.xml",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "build.gradle",
+                isCorrect: false,
+                position: 1,
+              },
+              {
+                optionText: "strings.xml",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "R.java",
+                isCorrect: false,
+                position: 3,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.multiple_choice.key,
+            questionBody:
+              "Which of the following are used for defining the user interface in Android? (Select all that apply)",
+            state: STATUS.published.key,
+            questionAnswers: [
+              {
+                optionText: "XML layouts",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Java code",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "Kotlin code",
+                isCorrect: true,
+                position: 2,
+              },
+              {
+                optionText: "HTML",
+                isCorrect: false,
+                position: 3,
+              },
+              {
+                optionText: "CSS",
+                isCorrect: false,
+                position: 4,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_dnd.key,
+            questionBody:
+              "In Android, [word] are used to start new screens, while [word] are used to perform background tasks.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In Android, <strong>Activities</strong> are used to start new screens, while <strong>Services</strong> are used to perform background tasks.</p>",
+            questionAnswers: [
+              {
+                optionText: "Activities",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Services",
+                isCorrect: true,
+                position: 1,
+              },
+              {
+                optionText: "Intents",
+                isCorrect: false,
+                position: 2,
+              },
+              {
+                optionText: "Fragments",
+                isCorrect: false,
+                position: 3,
+              },
+              {
+                optionText: "Layouts",
+                isCorrect: false,
+                position: 4,
+              },
+              {
+                optionText: "Threads",
+                isCorrect: false,
+                position: 5,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In Android Studio, the [word] tool is used to create and preview layouts, while the [word] tool is used to test apps on different device configurations.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In Android Studio, the <strong>Layout Editor</strong> tool is used to create and preview layouts, while the <strong>Emulator</strong> tool is used to test apps on different device configurations.</p>",
+            questionAnswers: [
+              {
+                optionText: "Layout Editor",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Emulator",
+                isCorrect: true,
+                position: 1,
+              },
+            ],
+          },
+          {
+            itemType: LESSON_ITEM_TYPE.question.key,
+            questionType: QUESTION_TYPE.fill_in_the_blanks_text.key,
+            questionBody:
+              "In Android, [word] are used to store app data persistently, while [word] are used for temporary data storage.",
+            state: STATUS.published.key,
+            solutionExplanation:
+              "<p>In Android, <strong>SharedPreferences</strong> are used to store app data persistently, while <strong>Bundle</strong> objects are used for temporary data storage.</p>",
+            questionAnswers: [
+              {
+                optionText: "SharedPreferences",
+                isCorrect: true,
+                position: 0,
+              },
+              {
+                optionText: "Bundle",
+                isCorrect: true,
+                position: 1,
+              },
+            ],
+          },
+        ],
+      },
     ],
   },
 ];
diff --git a/apps/api/src/questions/questions.service.ts b/apps/api/src/questions/questions.service.ts
index fa4449dee..6bbc08ede 100644
--- a/apps/api/src/questions/questions.service.ts
+++ b/apps/api/src/questions/questions.service.ts
@@ -11,6 +11,7 @@ import { and, eq, inArray, sql } from "drizzle-orm";
 import { DatabasePg, type UUIDType } from "src/common";
 import { LessonsRepository } from "src/lessons/repositories/lessons.repository";
 import {
+  courseLessons,
   lessonItems,
   lessons,
   questionAnswerOptions,
@@ -39,18 +40,27 @@ export class QuestionsService {
         throw new NotFoundException("Question not found");
       }
 
+      const [lesson] = await trx
+        .select({
+          lessonType: lessons.type,
+          isFree: sql<boolean>`COALESCE(${courseLessons.isFree}, FALSE)`,
+        })
+        .from(lessons)
+        .leftJoin(courseLessons, eq(courseLessons.lessonId, lessons.id))
+        .where(
+          and(
+            eq(lessons.id, answerQuestion.lessonId),
+            eq(courseLessons.courseId, answerQuestion.courseId),
+          ),
+        );
+
       const quizProgress = await this.lessonsRepository.getQuizProgress(
         answerQuestion.courseId,
         answerQuestion.lessonId,
         userId,
       );
 
-      const [lesson] = await trx
-        .select({ lessonType: lessons.type })
-        .from(lessons)
-        .where(eq(lessons.id, answerQuestion.lessonId));
-
-      if (lesson.lessonType === "quiz" && quizProgress.quizCompleted)
+      if (lesson.lessonType === "quiz" && quizProgress?.quizCompleted)
         throw new ConflictException("Quiz already completed");
 
       const lastAnswerId = await this.findExistingAnswer(
diff --git a/apps/api/src/seed-helpers.ts b/apps/api/src/seed-helpers.ts
index 3abc8a66c..ffcf50fcc 100644
--- a/apps/api/src/seed-helpers.ts
+++ b/apps/api/src/seed-helpers.ts
@@ -13,6 +13,8 @@ import {
   textBlocks,
 } from "src/storage/schema";
 
+import { QUESTION_TYPE } from "./questions/schema/questions.types";
+
 import type { DatabasePg } from "./common";
 import type { NiceCourseData } from "./utils/types/test-types";
 
@@ -69,6 +71,7 @@ export async function createNiceCourses(
         id: crypto.randomUUID(),
         courseId: course.id,
         lessonId: lesson.id,
+        isFree: lessonData.isFree,
       });
 
       for (const [index, item] of lessonData.items.entries()) {
@@ -143,7 +146,10 @@ export async function createNiceCourses(
               questionType: item.questionType,
               questionBody: item.questionBody,
               solutionExplanation:
-                item.solutionExplanation || "Explanation will be provided after answering.",
+                item.questionType === QUESTION_TYPE.fill_in_the_blanks_text.key ||
+                item.questionType === QUESTION_TYPE.fill_in_the_blanks_dnd.key
+                  ? item.solutionExplanation || "Explanation will be provided after answering."
+                  : null,
               state: item.state,
               authorId: adminUserId,
               createdAt: new Date().toISOString(),
diff --git a/apps/api/src/storage/migrations/0008_add_is_free_to_course_lessons.sql b/apps/api/src/storage/migrations/0008_add_is_free_to_course_lessons.sql
new file mode 100644
index 000000000..d98fa7855
--- /dev/null
+++ b/apps/api/src/storage/migrations/0008_add_is_free_to_course_lessons.sql
@@ -0,0 +1 @@
+ALTER TABLE "course_lessons" ADD COLUMN "is_free" boolean DEFAULT false NOT NULL;
\ No newline at end of file
diff --git a/apps/api/src/storage/migrations/meta/0008_snapshot.json b/apps/api/src/storage/migrations/meta/0008_snapshot.json
new file mode 100644
index 000000000..43b838756
--- /dev/null
+++ b/apps/api/src/storage/migrations/meta/0008_snapshot.json
@@ -0,0 +1,1848 @@
+{
+  "id": "8ee0e8ee-f2e2-4e25-8888-54b34958af06",
+  "prevId": "45a0bbf1-1549-4090-89bb-59e8901cf843",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.categories": {
+      "name": "categories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "categories_title_unique": {
+          "name": "categories_title_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "title"
+          ]
+        }
+      }
+    },
+    "public.conversation_messages": {
+      "name": "conversation_messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "read_at": {
+          "name": "read_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "conversation_messages_conversation_id_conversations_id_fk": {
+          "name": "conversation_messages_conversation_id_conversations_id_fk",
+          "tableFrom": "conversation_messages",
+          "tableTo": "conversations",
+          "columnsFrom": [
+            "conversation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "conversation_messages_author_id_users_id_fk": {
+          "name": "conversation_messages_author_id_users_id_fk",
+          "tableFrom": "conversation_messages",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.conversations": {
+      "name": "conversations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "participant1_id": {
+          "name": "participant1_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "participant2_id": {
+          "name": "participant2_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "conversations_participant1_id_users_id_fk": {
+          "name": "conversations_participant1_id_users_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "users",
+          "columnsFrom": [
+            "participant1_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "conversations_participant2_id_users_id_fk": {
+          "name": "conversations_participant2_id_users_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "users",
+          "columnsFrom": [
+            "participant2_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.course_lessons": {
+      "name": "course_lessons",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_id": {
+          "name": "lesson_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_free": {
+          "name": "is_free",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "course_lessons_course_id_courses_id_fk": {
+          "name": "course_lessons_course_id_courses_id_fk",
+          "tableFrom": "course_lessons",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "course_lessons_lesson_id_lessons_id_fk": {
+          "name": "course_lessons_lesson_id_lessons_id_fk",
+          "tableFrom": "course_lessons",
+          "tableTo": "lessons",
+          "columnsFrom": [
+            "lesson_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "course_lessons_course_id_lesson_id_unique": {
+          "name": "course_lessons_course_id_lesson_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "course_id",
+            "lesson_id"
+          ]
+        }
+      }
+    },
+    "public.courses": {
+      "name": "courses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "varchar(1000)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'draft'"
+        },
+        "price_in_cents": {
+          "name": "price_in_cents",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "currency": {
+          "name": "currency",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'usd'"
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "courses_author_id_users_id_fk": {
+          "name": "courses_author_id_users_id_fk",
+          "tableFrom": "courses",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "courses_category_id_categories_id_fk": {
+          "name": "courses_category_id_categories_id_fk",
+          "tableFrom": "courses",
+          "tableTo": "categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.create_tokens": {
+      "name": "create_tokens",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "create_token": {
+          "name": "create_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "timestamp (3) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "create_tokens_user_id_users_id_fk": {
+          "name": "create_tokens_user_id_users_id_fk",
+          "tableFrom": "create_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.credentials": {
+      "name": "credentials",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "credentials_user_id_users_id_fk": {
+          "name": "credentials_user_id_users_id_fk",
+          "tableFrom": "credentials",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.files": {
+      "name": "files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'draft'"
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "files_author_id_users_id_fk": {
+          "name": "files_author_id_users_id_fk",
+          "tableFrom": "files",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.lesson_items": {
+      "name": "lesson_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "lesson_id": {
+          "name": "lesson_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_item_id": {
+          "name": "lesson_item_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_item_type": {
+          "name": "lesson_item_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "lesson_items_lesson_id_lessons_id_fk": {
+          "name": "lesson_items_lesson_id_lessons_id_fk",
+          "tableFrom": "lesson_items",
+          "tableTo": "lessons",
+          "columnsFrom": [
+            "lesson_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.lessons": {
+      "name": "lessons",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "varchar(1000)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'draft'"
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'multimedia'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "lessons_author_id_users_id_fk": {
+          "name": "lessons_author_id_users_id_fk",
+          "tableFrom": "lessons",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.notifications": {
+      "name": "notifications",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "read_at": {
+          "name": "read_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "notifications_student_id_users_id_fk": {
+          "name": "notifications_student_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.question_answer_options": {
+      "name": "question_answer_options",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "question_id": {
+          "name": "question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "option_text": {
+          "name": "option_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "question_answer_options_question_id_questions_id_fk": {
+          "name": "question_answer_options_question_id_questions_id_fk",
+          "tableFrom": "question_answer_options",
+          "tableTo": "questions",
+          "columnsFrom": [
+            "question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.questions": {
+      "name": "questions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "question_type": {
+          "name": "question_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question_body": {
+          "name": "question_body",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "solution_explanation": {
+          "name": "solution_explanation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'draft'"
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "questions_author_id_users_id_fk": {
+          "name": "questions_author_id_users_id_fk",
+          "tableFrom": "questions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.reset_tokens": {
+      "name": "reset_tokens",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reset_token": {
+          "name": "reset_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expiry_date": {
+          "name": "expiry_date",
+          "type": "timestamp (3) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "reset_tokens_user_id_users_id_fk": {
+          "name": "reset_tokens_user_id_users_id_fk",
+          "tableFrom": "reset_tokens",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.student_completed_lesson_items": {
+      "name": "student_completed_lesson_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_item_id": {
+          "name": "lesson_item_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_id": {
+          "name": "lesson_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "student_completed_lesson_items_student_id_users_id_fk": {
+          "name": "student_completed_lesson_items_student_id_users_id_fk",
+          "tableFrom": "student_completed_lesson_items",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_completed_lesson_items_lesson_item_id_lesson_items_id_fk": {
+          "name": "student_completed_lesson_items_lesson_item_id_lesson_items_id_fk",
+          "tableFrom": "student_completed_lesson_items",
+          "tableTo": "lesson_items",
+          "columnsFrom": [
+            "lesson_item_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_completed_lesson_items_lesson_id_lessons_id_fk": {
+          "name": "student_completed_lesson_items_lesson_id_lessons_id_fk",
+          "tableFrom": "student_completed_lesson_items",
+          "tableTo": "lessons",
+          "columnsFrom": [
+            "lesson_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_completed_lesson_items_course_id_courses_id_fk": {
+          "name": "student_completed_lesson_items_course_id_courses_id_fk",
+          "tableFrom": "student_completed_lesson_items",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "student_completed_lesson_items_student_id_lesson_item_id_lesson_id_course_id_unique": {
+          "name": "student_completed_lesson_items_student_id_lesson_item_id_lesson_id_course_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "student_id",
+            "lesson_item_id",
+            "lesson_id",
+            "course_id"
+          ]
+        }
+      }
+    },
+    "public.student_courses": {
+      "name": "student_courses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_assignments": {
+          "name": "number_of_assignments",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_finished_assignments": {
+          "name": "number_of_finished_assignments",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'not_started'"
+        },
+        "payment_id": {
+          "name": "payment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "student_courses_student_id_users_id_fk": {
+          "name": "student_courses_student_id_users_id_fk",
+          "tableFrom": "student_courses",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_courses_course_id_courses_id_fk": {
+          "name": "student_courses_course_id_courses_id_fk",
+          "tableFrom": "student_courses",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "student_courses_student_id_course_id_unique": {
+          "name": "student_courses_student_id_course_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "student_id",
+            "course_id"
+          ]
+        }
+      }
+    },
+    "public.student_favourited_courses": {
+      "name": "student_favourited_courses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "student_favourited_courses_student_id_users_id_fk": {
+          "name": "student_favourited_courses_student_id_users_id_fk",
+          "tableFrom": "student_favourited_courses",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_favourited_courses_course_id_courses_id_fk": {
+          "name": "student_favourited_courses_course_id_courses_id_fk",
+          "tableFrom": "student_favourited_courses",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "student_favourited_courses_student_id_course_id_unique": {
+          "name": "student_favourited_courses_student_id_course_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "student_id",
+            "course_id"
+          ]
+        }
+      }
+    },
+    "public.student_lessons_progress": {
+      "name": "student_lessons_progress",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_id": {
+          "name": "lesson_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_completed": {
+          "name": "quiz_completed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lesson_item_count": {
+          "name": "lesson_item_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "completed_lesson_item_count": {
+          "name": "completed_lesson_item_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_score": {
+          "name": "quiz_score",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "student_lessons_progress_student_id_users_id_fk": {
+          "name": "student_lessons_progress_student_id_users_id_fk",
+          "tableFrom": "student_lessons_progress",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_lessons_progress_course_id_courses_id_fk": {
+          "name": "student_lessons_progress_course_id_courses_id_fk",
+          "tableFrom": "student_lessons_progress",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_lessons_progress_lesson_id_lessons_id_fk": {
+          "name": "student_lessons_progress_lesson_id_lessons_id_fk",
+          "tableFrom": "student_lessons_progress",
+          "tableTo": "lessons",
+          "columnsFrom": [
+            "lesson_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "student_lessons_progress_student_id_lesson_id_course_id_unique": {
+          "name": "student_lessons_progress_student_id_lesson_id_course_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "student_id",
+            "lesson_id",
+            "course_id"
+          ]
+        }
+      }
+    },
+    "public.student_question_answers": {
+      "name": "student_question_answers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lesson_id": {
+          "name": "lesson_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question_id": {
+          "name": "question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "student_id": {
+          "name": "student_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answer": {
+          "name": "answer",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'::jsonb"
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "student_question_answers_course_id_courses_id_fk": {
+          "name": "student_question_answers_course_id_courses_id_fk",
+          "tableFrom": "student_question_answers",
+          "tableTo": "courses",
+          "columnsFrom": [
+            "course_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_question_answers_lesson_id_lessons_id_fk": {
+          "name": "student_question_answers_lesson_id_lessons_id_fk",
+          "tableFrom": "student_question_answers",
+          "tableTo": "lessons",
+          "columnsFrom": [
+            "lesson_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_question_answers_question_id_questions_id_fk": {
+          "name": "student_question_answers_question_id_questions_id_fk",
+          "tableFrom": "student_question_answers",
+          "tableTo": "questions",
+          "columnsFrom": [
+            "question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "student_question_answers_student_id_users_id_fk": {
+          "name": "student_question_answers_student_id_users_id_fk",
+          "tableFrom": "student_question_answers",
+          "tableTo": "users",
+          "columnsFrom": [
+            "student_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "student_question_answers_lesson_id_question_id_student_id_unique": {
+          "name": "student_question_answers_lesson_id_question_id_student_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "lesson_id",
+            "question_id",
+            "student_id"
+          ]
+        }
+      }
+    },
+    "public.text_blocks": {
+      "name": "text_blocks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body": {
+          "name": "body",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'draft'"
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "text_blocks_author_id_users_id_fk": {
+          "name": "text_blocks_author_id_users_id_fk",
+          "tableFrom": "text_blocks",
+          "tableTo": "users",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "public.user_details": {
+      "name": "user_details",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "contact_phone_number": {
+          "name": "contact_phone_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contact_email": {
+          "name": "contact_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_details_user_id_users_id_fk": {
+          "name": "user_details_user_id_users_id_fk",
+          "tableFrom": "user_details",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_details_user_id_unique": {
+          "name": "user_details_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id"
+          ]
+        }
+      }
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'student'"
+        },
+        "archived": {
+          "name": "archived",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      }
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/apps/api/src/storage/migrations/meta/_journal.json b/apps/api/src/storage/migrations/meta/_journal.json
index ef34b803d..9c9763882 100644
--- a/apps/api/src/storage/migrations/meta/_journal.json
+++ b/apps/api/src/storage/migrations/meta/_journal.json
@@ -57,6 +57,13 @@
       "when": 1731027071587,
       "tag": "0007_create_user_details",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "7",
+      "when": 1731575473118,
+      "tag": "0008_add_is_free_to_course_lessons",
+      "breakpoints": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/apps/api/src/storage/schema/index.ts b/apps/api/src/storage/schema/index.ts
index b9d752ec2..38423d2ab 100644
--- a/apps/api/src/storage/schema/index.ts
+++ b/apps/api/src/storage/schema/index.ts
@@ -249,6 +249,7 @@ export const courseLessons = pgTable(
       .references(() => lessons.id)
       .notNull(),
     displayOrder: integer("display_order"),
+    isFree: boolean("is_free").notNull().default(false),
   },
   (table) => ({
     unq: unique().on(table.courseId, table.lessonId),
diff --git a/apps/api/src/swagger/api-schema.json b/apps/api/src/swagger/api-schema.json
index 348c9e5c0..c9401ca90 100644
--- a/apps/api/src/swagger/api-schema.json
+++ b/apps/api/src/swagger/api-schema.json
@@ -1593,7 +1593,17 @@
     "/api/lessons/available-lessons": {
       "get": {
         "operationId": "LessonsController_getAvailableLessons",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "courseId",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {
@@ -1794,6 +1804,33 @@
         }
       }
     },
+    "/api/lessons/course-lesson": {
+      "patch": {
+        "operationId": "LessonsController_toggleLessonAsFree",
+        "parameters": [],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ToggleLessonAsFreeBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ToggleLessonAsFreeResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/lessons/evaluation-quiz": {
       "post": {
         "operationId": "LessonsController_evaluationQuiz",
@@ -3573,6 +3610,9 @@
                 },
                 "createdAt": {
                   "type": "string"
+                },
+                "hasFreeLessons": {
+                  "type": "boolean"
                 }
               },
               "required": [
@@ -3682,6 +3722,9 @@
                 },
                 "createdAt": {
                   "type": "string"
+                },
+                "hasFreeLessons": {
+                  "type": "boolean"
                 }
               },
               "required": [
@@ -3791,6 +3834,9 @@
                 },
                 "createdAt": {
                   "type": "string"
+                },
+                "hasFreeLessons": {
+                  "type": "boolean"
                 }
               },
               "required": [
@@ -3900,6 +3946,9 @@
                 },
                 "createdAt": {
                   "type": "string"
+                },
+                "hasFreeLessons": {
+                  "type": "boolean"
                 }
               },
               "required": [
@@ -4017,6 +4066,12 @@
                         }
                       ]
                     },
+                    "isFree": {
+                      "type": "boolean"
+                    },
+                    "enrolled": {
+                      "type": "boolean"
+                    },
                     "state": {
                       "type": "string"
                     },
@@ -4052,6 +4107,9 @@
               },
               "archived": {
                 "type": "boolean"
+              },
+              "hasFreeLessons": {
+                "type": "boolean"
               }
             },
             "required": [
@@ -4166,6 +4224,12 @@
                         }
                       ]
                     },
+                    "isFree": {
+                      "type": "boolean"
+                    },
+                    "enrolled": {
+                      "type": "boolean"
+                    },
                     "state": {
                       "type": "string"
                     },
@@ -4201,6 +4265,9 @@
               },
               "archived": {
                 "type": "boolean"
+              },
+              "hasFreeLessons": {
+                "type": "boolean"
               }
             },
             "required": [
@@ -4434,6 +4501,12 @@
                     }
                   ]
                 },
+                "isFree": {
+                  "type": "boolean"
+                },
+                "enrolled": {
+                  "type": "boolean"
+                },
                 "state": {
                   "type": "string"
                 },
@@ -4493,29 +4566,46 @@
             "type": "array",
             "items": {
               "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "title": {
-                  "type": "string"
-                },
-                "description": {
-                  "type": "string"
-                },
-                "imageUrl": {
-                  "type": "string"
+              "allOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "format": "uuid",
+                      "type": "string"
+                    },
+                    "title": {
+                      "type": "string"
+                    },
+                    "imageUrl": {
+                      "type": "string"
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "isFree": {
+                      "type": "boolean"
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "title",
+                    "imageUrl",
+                    "description",
+                    "isFree"
+                  ]
                 },
-                "itemsCount": {
-                  "type": "number"
+                {
+                  "type": "object",
+                  "properties": {
+                    "itemsCount": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "itemsCount"
+                  ]
                 }
-              },
-              "required": [
-                "id",
-                "title",
-                "description",
-                "imageUrl",
-                "itemsCount"
               ]
             }
           }
@@ -4565,6 +4655,12 @@
                   }
                 ]
               },
+              "isFree": {
+                "type": "boolean"
+              },
+              "enrolled": {
+                "type": "boolean"
+              },
               "state": {
                 "type": "string"
               },
@@ -4830,6 +4926,12 @@
                   }
                 ]
               },
+              "isFree": {
+                "type": "boolean"
+              },
+              "enrolled": {
+                "type": "boolean"
+              },
               "state": {
                 "type": "string"
               },
@@ -5082,6 +5184,12 @@
               }
             ]
           },
+          "isFree": {
+            "type": "boolean"
+          },
+          "enrolled": {
+            "type": "boolean"
+          },
           "state": {
             "type": "string"
           },
@@ -5158,6 +5266,12 @@
               }
             ]
           },
+          "isFree": {
+            "type": "boolean"
+          },
+          "enrolled": {
+            "type": "boolean"
+          },
           "state": {
             "type": "string"
           },
@@ -5255,6 +5369,50 @@
           "data"
         ]
       },
+      "ToggleLessonAsFreeBody": {
+        "type": "object",
+        "properties": {
+          "courseId": {
+            "format": "uuid",
+            "type": "string"
+          },
+          "lessonId": {
+            "format": "uuid",
+            "type": "string"
+          },
+          "isFree": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "courseId",
+          "lessonId",
+          "isFree"
+        ]
+      },
+      "ToggleLessonAsFreeResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "isFree": {
+                "type": "boolean"
+              },
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "isFree",
+              "message"
+            ]
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
       "EvaluationQuizResponse": {
         "type": "object",
         "properties": {
diff --git a/apps/web/app/api/generated-api.ts b/apps/web/app/api/generated-api.ts
index 8bb8daa21..27862bba8 100644
--- a/apps/web/app/api/generated-api.ts
+++ b/apps/web/app/api/generated-api.ts
@@ -335,6 +335,7 @@ export interface GetAllCoursesResponse {
     state?: string;
     archived?: boolean;
     createdAt?: string;
+    hasFreeLessons?: boolean;
   }[];
   pagination: {
     totalItems: number;
@@ -364,6 +365,7 @@ export interface GetStudentCoursesResponse {
     state?: string;
     archived?: boolean;
     createdAt?: string;
+    hasFreeLessons?: boolean;
   }[];
   pagination: {
     totalItems: number;
@@ -393,6 +395,7 @@ export interface GetAvailableCoursesResponse {
     state?: string;
     archived?: boolean;
     createdAt?: string;
+    hasFreeLessons?: boolean;
   }[];
   pagination: {
     totalItems: number;
@@ -422,6 +425,7 @@ export interface GetTutorCoursesResponse {
     state?: string;
     archived?: boolean;
     createdAt?: string;
+    hasFreeLessons?: boolean;
   }[];
 }
 
@@ -452,6 +456,8 @@ export interface GetCourseResponse {
       itemsCount: number;
       itemsCompletedCount?: number;
       lessonProgress?: "completed" | "in_progress" | "not_started";
+      isFree?: boolean;
+      enrolled?: boolean;
       state?: string;
       archived?: boolean;
       isSubmitted?: boolean;
@@ -462,6 +468,7 @@ export interface GetCourseResponse {
     priceInCents: number;
     currency: string;
     archived?: boolean;
+    hasFreeLessons?: boolean;
   };
 }
 
@@ -492,6 +499,8 @@ export interface GetCourseByIdResponse {
       itemsCount: number;
       itemsCompletedCount?: number;
       lessonProgress?: "completed" | "in_progress" | "not_started";
+      isFree?: boolean;
+      enrolled?: boolean;
       state?: string;
       archived?: boolean;
       isSubmitted?: boolean;
@@ -502,6 +511,7 @@ export interface GetCourseByIdResponse {
     priceInCents: number;
     currency: string;
     archived?: boolean;
+    hasFreeLessons?: boolean;
   };
 }
 
@@ -563,6 +573,8 @@ export interface GetAllLessonsResponse {
     itemsCount: number;
     itemsCompletedCount?: number;
     lessonProgress?: "completed" | "in_progress" | "not_started";
+    isFree?: boolean;
+    enrolled?: boolean;
     state?: string;
     archived?: boolean;
     isSubmitted?: boolean;
@@ -578,13 +590,16 @@ export interface GetAllLessonsResponse {
 }
 
 export interface GetAvailableLessonsResponse {
-  data: {
+  data: ({
+    /** @format uuid */
     id: string;
     title: string;
-    description: string;
     imageUrl: string;
+    description: string;
+    isFree: boolean;
+  } & {
     itemsCount: number;
-  }[];
+  })[];
 }
 
 export interface GetLessonResponse {
@@ -597,6 +612,8 @@ export interface GetLessonResponse {
     itemsCount: number;
     itemsCompletedCount?: number;
     lessonProgress?: "completed" | "in_progress" | "not_started";
+    isFree?: boolean;
+    enrolled?: boolean;
     state?: string;
     archived?: boolean;
     isSubmitted?: boolean;
@@ -655,6 +672,8 @@ export interface GetLessonByIdResponse {
     itemsCount: number;
     itemsCompletedCount?: number;
     lessonProgress?: "completed" | "in_progress" | "not_started";
+    isFree?: boolean;
+    enrolled?: boolean;
     state?: string;
     archived?: boolean;
     isSubmitted?: boolean;
@@ -708,6 +727,8 @@ export interface CreateLessonBody {
   imageUrl?: string;
   description: string;
   lessonProgress?: "completed" | "in_progress" | "not_started";
+  isFree?: boolean;
+  enrolled?: boolean;
   state?: string;
   archived?: boolean;
   isSubmitted?: boolean;
@@ -729,6 +750,8 @@ export interface UpdateLessonBody {
   imageUrl?: string;
   description?: string;
   lessonProgress?: "completed" | "in_progress" | "not_started";
+  isFree?: boolean;
+  enrolled?: boolean;
   state?: string;
   archived?: boolean;
   isSubmitted?: boolean;
@@ -763,6 +786,21 @@ export interface RemoveLessonFromCourseResponse {
   };
 }
 
+export interface ToggleLessonAsFreeBody {
+  /** @format uuid */
+  courseId: string;
+  /** @format uuid */
+  lessonId: string;
+  isFree: boolean;
+}
+
+export interface ToggleLessonAsFreeResponse {
+  data: {
+    isFree: boolean;
+    message: string;
+  };
+}
+
 export interface EvaluationQuizResponse {
   data: {
     message: string;
@@ -2072,10 +2110,17 @@ export class API<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name LessonsControllerGetAvailableLessons
      * @request GET:/api/lessons/available-lessons
      */
-    lessonsControllerGetAvailableLessons: (params: RequestParams = {}) =>
+    lessonsControllerGetAvailableLessons: (
+      query: {
+        /** @format uuid */
+        courseId: string;
+      },
+      params: RequestParams = {},
+    ) =>
       this.request<GetAvailableLessonsResponse, any>({
         path: `/api/lessons/available-lessons`,
         method: "GET",
+        query: query,
         format: "json",
         ...params,
       }),
@@ -2191,6 +2236,25 @@ export class API<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params,
       }),
 
+    /**
+     * No description
+     *
+     * @name LessonsControllerToggleLessonAsFree
+     * @request PATCH:/api/lessons/course-lesson
+     */
+    lessonsControllerToggleLessonAsFree: (
+      data: ToggleLessonAsFreeBody,
+      params: RequestParams = {},
+    ) =>
+      this.request<ToggleLessonAsFreeResponse, any>({
+        path: `/api/lessons/course-lesson`,
+        method: "PATCH",
+        body: data,
+        type: ContentType.Json,
+        format: "json",
+        ...params,
+      }),
+
     /**
      * No description
      *
diff --git a/apps/web/app/api/mutations/admin/useToggleLessonAsFree.ts b/apps/web/app/api/mutations/admin/useToggleLessonAsFree.ts
new file mode 100644
index 000000000..ec4f6f7a4
--- /dev/null
+++ b/apps/web/app/api/mutations/admin/useToggleLessonAsFree.ts
@@ -0,0 +1,39 @@
+import { useMutation } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+
+import { useToast } from "~/components/ui/use-toast";
+
+import { ApiClient } from "../../api-client";
+
+import type { ToggleLessonAsFreeBody } from "../../generated-api";
+
+type ToggleLessonOptions = {
+  data: ToggleLessonAsFreeBody;
+};
+
+export function useToggleLessonAsFree() {
+  const { toast } = useToast();
+
+  return useMutation({
+    mutationFn: async (options: ToggleLessonOptions) => {
+      const response = await ApiClient.api.lessonsControllerToggleLessonAsFree(options.data);
+
+      return response.data;
+    },
+    onSuccess: ({ data }) => {
+      toast({ description: data.message ?? "Lesson toggled as free successfully" });
+    },
+    onError: (error) => {
+      if (error instanceof AxiosError) {
+        return toast({
+          description: error.response?.data.message,
+          variant: "destructive",
+        });
+      }
+      toast({
+        description: error.message,
+        variant: "destructive",
+      });
+    },
+  });
+}
diff --git a/apps/web/app/api/mutations/admin/useUpdateLesson.ts b/apps/web/app/api/mutations/admin/useUpdateLesson.ts
index 5074f62db..87b8bbf54 100644
--- a/apps/web/app/api/mutations/admin/useUpdateLesson.ts
+++ b/apps/web/app/api/mutations/admin/useUpdateLesson.ts
@@ -26,6 +26,7 @@ export function useUpdateLesson() {
     onSuccess: () => {
       toast({
         variant: "default",
+        title: "Lesson updated successfully",
         description: "Lesson updated successfully",
       });
     },
diff --git a/apps/web/app/api/queries/useAvailableLessons.ts b/apps/web/app/api/queries/useAvailableLessons.ts
index 7e2294a98..125164566 100644
--- a/apps/web/app/api/queries/useAvailableLessons.ts
+++ b/apps/web/app/api/queries/useAvailableLessons.ts
@@ -4,19 +4,20 @@ import { ApiClient } from "../api-client";
 
 import type { GetAvailableLessonsResponse } from "../generated-api";
 
-export const availableLessons = queryOptions({
-  queryKey: ["available-lessons"],
-  queryFn: async () => {
-    const response = await ApiClient.api.lessonsControllerGetAvailableLessons();
-    return response.data;
-  },
-  select: (data: GetAvailableLessonsResponse) => data.data,
-});
+export const availableLessons = (courseId: string) =>
+  queryOptions({
+    queryKey: ["available-lessons", "courseId"],
+    queryFn: async () => {
+      const response = await ApiClient.api.lessonsControllerGetAvailableLessons({ courseId });
+      return response.data;
+    },
+    select: (data: GetAvailableLessonsResponse) => data.data,
+  });
 
-export function useAvailableLessons() {
-  return useQuery(availableLessons);
+export function useAvailableLessons(courseId: string) {
+  return useQuery(availableLessons(courseId));
 }
 
-export function useAvailableLessonsSuspense() {
-  return useSuspenseQuery(availableLessons);
+export function useAvailableLessonsSuspense(courseId: string) {
+  return useSuspenseQuery(availableLessons(courseId));
 }
diff --git a/apps/web/app/assets/svgs/free-right.svg b/apps/web/app/assets/svgs/free-right.svg
new file mode 100644
index 000000000..933c68603
--- /dev/null
+++ b/apps/web/app/assets/svgs/free-right.svg
@@ -0,0 +1,8 @@
+<svg viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M13.9085 7.45802C14.4838 10.7213 12.3045 13.8333 9.04183 14.4087C5.7785 14.984 2.6665 12.8053 2.09117 9.54202C1.51583 6.27868 3.6945 3.16668 6.95783 2.59135C10.2212 2.01602 13.3332 4.19468 13.9085 7.45802" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M4.69629 3.49731L5.66029 4.95731" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M11.3029 13.5027L10.3389 12.0427" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M6.84335 10.026C7.01535 10.308 7.31002 10.502 7.66535 10.502H8.39602C8.91268 10.502 9.33202 10.0833 9.33202 9.566C9.33202 9.13667 9.04002 8.762 8.62402 8.658L7.37468 8.34467C6.95802 8.24 6.66602 7.86533 6.66602 7.436C6.66602 6.91933 7.08468 6.5 7.60202 6.5H8.33268C8.68802 6.5 8.98268 6.69467 9.15468 6.976" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M7.99935 5.83331V6.49998" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M7.99935 11.1667V10.5" stroke="#FCFCFC" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/apps/web/app/assets/svgs/index.ts b/apps/web/app/assets/svgs/index.ts
index f0071ffa0..66b037d4d 100644
--- a/apps/web/app/assets/svgs/index.ts
+++ b/apps/web/app/assets/svgs/index.ts
@@ -22,3 +22,4 @@ export { default as Lesson } from "./lesson.svg?react";
 export { default as LessonContent } from "./lesson-content.svg?react";
 export { default as Email } from "./email.svg?react";
 export { default as Phone } from "./phone.svg?react";
+export { default as FreeRight } from "./free-right.svg?react";
diff --git a/apps/web/app/components/CardBadge.tsx b/apps/web/app/components/CardBadge.tsx
new file mode 100644
index 000000000..b7d1ac6bc
--- /dev/null
+++ b/apps/web/app/components/CardBadge.tsx
@@ -0,0 +1,30 @@
+import { cva } from "class-variance-authority";
+
+import { cn } from "~/lib/utils";
+
+import type { VariantProps } from "class-variance-authority";
+import type { HTMLAttributes } from "react";
+
+const badgeVariants = cva(
+  "w-fit inline-flex items-center details-md px-1 py-0.5 gap-x-1 rounded-lg bg-white",
+  {
+    variants: {
+      variant: {
+        default: "text-neutral-900",
+        primary: "text-primary-950",
+        secondary: "text-secondary-700",
+        successOutlined: "text-success-800",
+        successFilled: "text-white bg-success-600",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  },
+);
+
+export type BadgeProps = HTMLAttributes<HTMLDivElement> & VariantProps<typeof badgeVariants>;
+
+export const CardBadge = ({ className, variant, ...props }: BadgeProps) => {
+  return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
+};
diff --git a/apps/web/app/components/RichText/Viever.tsx b/apps/web/app/components/RichText/Viever.tsx
index 4113daacd..cd751c125 100644
--- a/apps/web/app/components/RichText/Viever.tsx
+++ b/apps/web/app/components/RichText/Viever.tsx
@@ -2,12 +2,15 @@ import { EditorContent, useEditor } from "@tiptap/react";
 // eslint-disable-next-line import/no-named-as-default
 import StarterKit from "@tiptap/starter-kit";
 
+import { cn } from "~/lib/utils";
+
 type ViewerProps = {
   content: string;
   style?: "default" | "prose";
+  className?: string;
 };
 
-const Viewer = ({ content, style }: ViewerProps) => {
+const Viewer = ({ content, style, className }: ViewerProps) => {
   const editor = useEditor({
     extensions: [StarterKit],
     content: content,
@@ -16,12 +19,20 @@ const Viewer = ({ content, style }: ViewerProps) => {
 
   if (!editor) return <></>;
 
-  const className: string =
-    style === "prose" ? "prose-mt-0 prose max-w-none dark:prose-invert" : "";
+  const classNames = cn(
+    { "prose-mt-0 prose max-w-none dark:prose-invert": style === "prose" },
+    className,
+  );
+
+  const unOrderedListClasses = "[&>div>ul]:list-disc [&>div>ul]:list-inside [&>div>ul>li>p]:inline";
+  const orderedListClasses =
+    "[&>div>ol]:list-decimal [&>div>ol]:list-inside [&>div>ol>li>p]:inline";
+
+  const editorClasses = cn(unOrderedListClasses, orderedListClasses);
 
   return (
-    <article className={className}>
-      <EditorContent editor={editor} readOnly={true} />
+    <article className={classNames}>
+      <EditorContent editor={editor} readOnly={true} className={editorClasses} />
     </article>
   );
 };
diff --git a/apps/web/app/components/ui/toaster.tsx b/apps/web/app/components/ui/toaster.tsx
index 867860180..cc437d088 100644
--- a/apps/web/app/components/ui/toaster.tsx
+++ b/apps/web/app/components/ui/toaster.tsx
@@ -8,6 +8,8 @@ import {
 } from "~/components/ui/toast";
 import { useToast } from "~/components/ui/use-toast";
 
+import { Icon } from "../Icon";
+
 export function Toaster() {
   const { toasts } = useToast();
 
@@ -16,9 +18,14 @@ export function Toaster() {
       {toasts.map(function ({ id, title, description, action, ...props }) {
         return (
           <Toast key={id} {...props}>
-            <div className="grid gap-1">
-              {title && <ToastTitle>{title}</ToastTitle>}
-              {description && <ToastDescription>{description}</ToastDescription>}
+            <div className="flex gap-1 items-center">
+              {props.variant === "default" && (
+                <Icon name="InputRoundedMarkerSuccess" className="h-4 w-4 text-green-500 mr-2" />
+              )}
+              <div className="flex flex-col">
+                {title && <ToastTitle>{title}</ToastTitle>}
+                {description && <ToastDescription>{description}</ToastDescription>}
+              </div>
             </div>
             {action}
             <ToastClose />
diff --git a/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonAssigner.tsx b/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonAssigner.tsx
index fd6a2de0b..b075fb6ca 100644
--- a/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonAssigner.tsx
+++ b/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonAssigner.tsx
@@ -28,6 +28,8 @@ import type { GetAllLessonsResponse } from "~/api/generated-api";
 
 type TransformedLesson = GetAllLessonsResponse["data"][number] & {
   columnId: string;
+  courseId: string;
+  isFree: boolean;
 };
 
 interface LessonAssignerProps {
@@ -64,12 +66,12 @@ const LessonAssigner: FC<LessonAssignerProps> = ({ courseId }) => {
   const [currentlyDraggedItem, setCurrentlyDraggedItem] = useState<TransformedLesson | null>(null);
 
   const { data: course } = useCourseById(courseId);
-  const { data: allLessons } = useAvailableLessons();
+  const { data: allLessons } = useAvailableLessons(courseId);
   const { mutateAsync: addLessonToCourse } = useAddLessonToCourse();
   const { mutateAsync: removeLessonFromCourse } = useRemoveLessonFromCourse();
 
   const sensors = useSensors(
-    useSensor(PointerSensor),
+    useSensor(PointerSensor, { activationConstraint: { distance: 10 } }),
     useSensor(KeyboardSensor, {
       coordinateGetter: sortableKeyboardCoordinates,
     }),
@@ -83,6 +85,7 @@ const LessonAssigner: FC<LessonAssignerProps> = ({ courseId }) => {
         columnId: courseAssignedLessonIds.includes(lesson.id)
           ? "column-assigned"
           : "column-unassigned",
+        courseId: course.id,
       }));
       setLessons(transformedLessons);
     }
diff --git a/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonCard.tsx b/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonCard.tsx
index 8bce80966..4d7ec8c97 100644
--- a/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonCard.tsx
+++ b/apps/web/app/modules/Admin/Courses/LessonAssigner/LessonCard.tsx
@@ -1,13 +1,18 @@
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import { useState } from "react";
 
+import { useToggleLessonAsFree } from "~/api/mutations/admin/useToggleLessonAsFree";
 import CardPlaceholder from "~/assets/placeholders/card-placeholder.jpg";
 import Viewer from "~/components/RichText/Viever";
+import { Checkbox } from "~/components/ui/checkbox";
 
 import type { GetAllLessonsResponse } from "~/api/generated-api";
 
 type TransformedLesson = GetAllLessonsResponse["data"][number] & {
   columnId: string;
+  courseId: string;
+  isFree: boolean;
 };
 
 interface LessonCardProps {
@@ -19,6 +24,10 @@ export function LessonCard({ lesson }: LessonCardProps) {
     id: lesson.id,
   });
 
+  const [isChecked, setIsChecked] = useState(lesson.isFree);
+
+  const { mutateAsync: toggleLessonAsFree } = useToggleLessonAsFree();
+
   const style = {
     transform: CSS.Transform.toString(transform),
     transition,
@@ -42,7 +51,28 @@ export function LessonCard({ lesson }: LessonCardProps) {
       />
       <div>
         <h4 className="font-medium">{lesson.title}</h4>
-        <Viewer content={lesson.description} />
+        <Viewer className="line-clamp-2" content={lesson.description} />
+        {lesson.columnId === "column-assigned" && (
+          <div className="flex items-center space-x-2">
+            <Checkbox
+              id={lesson.id}
+              checked={isChecked}
+              onCheckedChange={(value) =>
+                toggleLessonAsFree({
+                  data: { lessonId: lesson.id, courseId: lesson.courseId, isFree: value === true },
+                }).then(({ data }) => {
+                  setIsChecked(data.isFree);
+                })
+              }
+            />
+            <label
+              htmlFor={lesson.id}
+              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+            >
+              Free
+            </label>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/apps/web/app/modules/Admin/Lessons/LessonDetails.tsx b/apps/web/app/modules/Admin/Lessons/LessonDetails.tsx
index 3ca212842..234f68716 100644
--- a/apps/web/app/modules/Admin/Lessons/LessonDetails.tsx
+++ b/apps/web/app/modules/Admin/Lessons/LessonDetails.tsx
@@ -46,15 +46,15 @@ export const LessonDetails = memo<{
         return (
           <div className="flex items-center space-x-2">
             <Checkbox
-              id="archived"
+              id={name}
               checked={field.value as boolean | undefined}
               onCheckedChange={(checked) => field.onChange(checked)}
             />
             <label
-              htmlFor="archived"
+              htmlFor={name}
               className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
             >
-              Archived
+              {startCase(name)}
             </label>
           </div>
         );
diff --git a/apps/web/app/modules/Courses/CourseView/CourseView.page.tsx b/apps/web/app/modules/Courses/CourseView/CourseView.page.tsx
index 9604ecfbc..aba3aa01e 100644
--- a/apps/web/app/modules/Courses/CourseView/CourseView.page.tsx
+++ b/apps/web/app/modules/Courses/CourseView/CourseView.page.tsx
@@ -43,7 +43,7 @@ export default function CoursesViewPage() {
   return (
     <div className="h-full">
       <div className="flex flex-col md:flex-row h-full gap-6 px-6">
-        <CourseViewMainCard course={course} />
+        <CourseViewMainCard {...course} />
         <LessonsList lessons={course.lessons} isEnrolled={course.enrolled || isAdmin} />
       </div>
     </div>
diff --git a/apps/web/app/modules/Courses/CourseView/CourseViewMainCard.tsx b/apps/web/app/modules/Courses/CourseView/CourseViewMainCard.tsx
index 7f6a611c9..337979536 100644
--- a/apps/web/app/modules/Courses/CourseView/CourseViewMainCard.tsx
+++ b/apps/web/app/modules/Courses/CourseView/CourseViewMainCard.tsx
@@ -6,8 +6,10 @@ import { useUnenrollCourse } from "~/api/mutations/useUnenrollCourse";
 import { courseQueryOptions } from "~/api/queries/useCourse";
 import { queryClient } from "~/api/queryClient";
 import CardPlaceholder from "~/assets/placeholders/card-placeholder.jpg";
+import { CardBadge } from "~/components/CardBadge";
 import CourseProgress from "~/components/CourseProgress";
 import { Gravatar } from "~/components/Gravatar";
+import { Icon } from "~/components/Icon";
 import Viewer from "~/components/RichText/Viever";
 import { Avatar } from "~/components/ui/avatar";
 import { Button } from "~/components/ui/button";
@@ -20,23 +22,26 @@ import { PaymentModal } from "~/modules/stripe/PaymentModal";
 
 import type { GetCourseResponse } from "~/api/generated-api";
 
-export const CourseViewMainCard = ({ course }: { course: GetCourseResponse["data"] }) => {
-  const {
-    category,
-    currency,
-    description,
-    imageUrl,
-    title,
-    enrolled: isEnrolled,
-    courseLessonCount,
-    completedLessonCount = 0,
-    priceInCents,
-    authorId,
-    author,
-    authorEmail = "",
-  } = course;
-  const { mutateAsync: unenrollCourse } = useUnenrollCourse();
+type CourseViewMainCardProps = GetCourseResponse["data"];
+
+export const CourseViewMainCard = ({
+  author,
+  authorEmail = "",
+  authorId,
+  category,
+  completedLessonCount = 0,
+  courseLessonCount,
+  currency,
+  description,
+  enrolled: isEnrolled,
+  hasFreeLessons = false,
+  imageUrl,
+  priceInCents,
+  title,
+  lessons,
+}: CourseViewMainCardProps) => {
   const { mutateAsync: enrollCourse } = useEnrollCourse();
+  const { mutateAsync: unenrollCourse } = useUnenrollCourse();
   const { id: courseId } = useParams<{ id: string }>();
   const { isAdmin } = useUserRole();
 
@@ -51,8 +56,8 @@ export const CourseViewMainCard = ({ course }: { course: GetCourseResponse["data
   }
 
   const firstUncompletedLesson =
-    course.lessons.find((lesson) => (lesson.itemsCompletedCount ?? 0) < lesson.itemsCount)?.id ??
-    last(course.lessons)?.id;
+    lessons.find((lesson) => (lesson.itemsCompletedCount ?? 0) < lesson.itemsCount)?.id ??
+    last(lessons)?.id;
 
   const handleEnroll = () => {
     enrollCourse({ id: courseId }).then(() => {
@@ -68,8 +73,14 @@ export const CourseViewMainCard = ({ course }: { course: GetCourseResponse["data
 
   return (
     <div className="md:w-[380px] xl:w-[480px] shrink-0 flex flex-col rounded-2xl bg-white drop-shadow-primary relative">
-      <div className="absolute top-4 left-4 right-4">
+      <div className="absolute top-4 left-4 right-4 flex flex-col gap-y-1">
         <CategoryChip category={category} />
+        {hasFreeLessons && !isEnrolled && (
+          <CardBadge variant="successFilled">
+            <Icon name="FreeRight" className="w-4" />
+            Free Lessons!
+          </CardBadge>
+        )}
       </div>
       <img
         src={imageUrl || CardPlaceholder}
@@ -95,7 +106,7 @@ export const CourseViewMainCard = ({ course }: { course: GetCourseResponse["data
           <span className="text-primary-700">{author}</span>
         </Link>
         <div className="min-h-0 scrollbar-thin overflow-auto">
-          <Viewer content={description} />
+          <Viewer content={description} className="text-neutral-900 body-base" />
         </div>
         <div className="mt-auto">
           {!isAdmin && isEnrolled && (
diff --git a/apps/web/app/modules/Courses/CourseView/LessonCard.tsx b/apps/web/app/modules/Courses/CourseView/LessonCard.tsx
index cfb5071b8..81c681ba1 100644
--- a/apps/web/app/modules/Courses/CourseView/LessonCard.tsx
+++ b/apps/web/app/modules/Courses/CourseView/LessonCard.tsx
@@ -3,9 +3,10 @@ import { cva } from "class-variance-authority";
 import { startCase } from "lodash-es";
 
 import CardPlaceholder from "~/assets/placeholders/card-placeholder.jpg";
-import { CaretRight } from "~/assets/svgs";
+import { CardBadge } from "~/components/CardBadge";
 import CourseProgress from "~/components/CourseProgress";
 import { Icon } from "~/components/Icon";
+import Viewer from "~/components/RichText/Viever";
 import { Card, CardContent } from "~/components/ui/card";
 import { cn } from "~/lib/utils";
 
@@ -19,8 +20,7 @@ type LessonCardProps = Lesson & {
   index: number;
   isEnrolled: boolean;
   isAdmin: boolean;
-  type?: string;
-  lessonProgress?: LessonStatus;
+  isFree?: boolean;
 };
 
 const buttonVariants = cva("w-full transition", {
@@ -36,55 +36,77 @@ const buttonVariants = cva("w-full transition", {
   },
 });
 
-const cardBadgeLabelVariants = cva("details-md", {
-  defaultVariants: {
-    variant: "not_started",
-  },
-  variants: {
-    variant: {
-      not_started: "text-neutral-900",
-      in_progress: "text-secondary-700",
-      completed: "text-success-800",
-    },
-  },
-});
+const getButtonProps = (lessonProgress: LessonStatus, isAdmin: boolean, type?: string) => {
+  if (isAdmin) {
+    return { text: "Lesson preview", colorClass: "text-primary-700" };
+  }
+
+  if (lessonProgress === "completed") {
+    return type === "quiz"
+      ? { text: "Try again", colorClass: "text-success-600" }
+      : { text: "Read more", colorClass: "text-success-600" };
+  }
+
+  if (lessonProgress === "in_progress") {
+    return { text: "Continue", colorClass: "text-secondary-500" };
+  }
+
+  if (lessonProgress === "not_started" && type === "quiz") {
+    return { text: "Start", colorClass: "text-primary-700" };
+  }
+
+  return { text: "Read more", colorClass: "text-primary-700" };
+};
+
+const cardBadgeIcon = {
+  completed: "InputRoundedMarkerSuccess",
+  in_progress: "InProgress",
+  not_started: "NotStartedRounded",
+} as const;
+
+const cardBadgeVariant: Record<string, "successOutlined" | "secondary" | "default"> = {
+  completed: "successOutlined",
+  in_progress: "secondary",
+  not_started: "default",
+};
 
 export const LessonCard = ({
-  id: lessonId,
-  lessonProgress = "not_started",
+  description,
+  imageUrl,
   index,
+  isAdmin,
   isEnrolled,
-  imageUrl,
+  isFree = false,
   itemsCompletedCount,
   itemsCount,
+  id: lessonId,
+  lessonProgress = "not_started",
   title,
   type,
-  description,
-  isAdmin,
 }: LessonCardProps) => {
   const cardClasses = buttonVariants({
     className: cn({
-      "opacity-60 cursor-not-allowed": !isEnrolled,
+      "opacity-60 cursor-not-allowed hover:border-primary-200": !isEnrolled && !isFree,
     }),
     variant: lessonProgress,
   });
 
-  const cardBadgeIcon = {
-    completed: "InputRoundedMarkerSuccess",
-    in_progress: "InProgress",
-    not_started: "NotStartedRounded",
-  } as const;
+  const { text: buttonText, colorClass: buttonColorClass } = getButtonProps(
+    lessonProgress,
+    isAdmin,
+    type,
+  );
 
   return (
-    <Card key={index} className={cardClasses}>
+    <Card className={cardClasses}>
       <CardContent className="p-4 h-full">
         <Link
           className={cn("flex flex-col h-full gap-4", {
-            "cursor-not-allowed": !isEnrolled,
+            "cursor-not-allowed": !isEnrolled && !isFree,
           })}
-          to={isEnrolled ? `lesson/${lessonId}` : "#"}
-          onClick={(e) => !isEnrolled && e.preventDefault()}
-          aria-disabled={!isEnrolled}
+          to={isEnrolled || isFree ? `lesson/${lessonId}` : "#"}
+          onClick={(e) => !isEnrolled && !isFree && e.preventDefault()}
+          aria-disabled={!isEnrolled && !isFree}
         >
           <div className="relative">
             <img
@@ -98,16 +120,13 @@ export const LessonCard = ({
               }}
             />
             {lessonProgress && (
-              <div className="flex items-center absolute gap-x-1 py-0.5 px-1 left-3 top-3 bg-white rounded-lg">
+              <CardBadge
+                variant={cardBadgeVariant[lessonProgress]}
+                className="absolute top-3 left-3"
+              >
                 <Icon name={cardBadgeIcon[lessonProgress]} />
-                <span
-                  className={cardBadgeLabelVariants({
-                    variant: lessonProgress,
-                  })}
-                >
-                  {startCase(lessonProgress)}
-                </span>
-              </div>
+                {startCase(lessonProgress)}
+              </CardBadge>
             )}
             <span className="absolute bottom-0 right-0 -translate-x-1/2 translate-y-1/2 bg-white rounded-full w-8 h-8 flex justify-center items-center text-primary-700">
               {(index + 1).toString().padStart(2, "0")}
@@ -126,22 +145,16 @@ export const LessonCard = ({
             </div>
             <div className="flex flex-col gap-y-2 pb-4">
               <h4 className="font-medium text-sm text-neutral-950 mt-2">{title}</h4>
-              <p className="text-xs text-neutral-900 mt-1 line-clamp-3 flex-grow leading-5">
-                {description}
-              </p>
+              <Viewer
+                content={description}
+                className="text-xs text-neutral-900 mt-1 line-clamp-3 flex-grow leading-5"
+              />
             </div>
-            <Link
-              to={`lesson/${lessonId}`}
-              className="text-primary-700 text-xs mt-auto self-start font-medium"
+            <button
+              className={cn("text-xs mt-auto inline-flex self-start font-medium", buttonColorClass)}
             >
-              {isAdmin ? (
-                "Lesson preview"
-              ) : isEnrolled ? (
-                <>
-                  Read more <CaretRight className="w-3 h-3 inline-block text-primary-700" />
-                </>
-              ) : null}
-            </Link>
+              {buttonText} <Icon name="CaretRight" className="w-3 h-3 ml-1" />
+            </button>
           </div>
         </Link>
       </CardContent>
diff --git a/apps/web/app/modules/Courses/CourseView/LessonsList.tsx b/apps/web/app/modules/Courses/CourseView/LessonsList.tsx
index 12dcd45c6..9bfa364a4 100644
--- a/apps/web/app/modules/Courses/CourseView/LessonsList.tsx
+++ b/apps/web/app/modules/Courses/CourseView/LessonsList.tsx
@@ -33,10 +33,10 @@ export const LessonsList = ({ lessons, isEnrolled }: LessonsListProps) => {
   );
 
   const lessonCards = useMemo(() => {
-    return filteredLessons.map((item, index) => (
+    return filteredLessons.map((lesson, index) => (
       <LessonCard
-        {...item}
-        key={item.id}
+        {...lesson}
+        key={lesson.id}
         index={index}
         isEnrolled={!!isEnrolled}
         isAdmin={isAdmin}
diff --git a/apps/web/app/modules/Courses/Lesson/Lesson.page.tsx b/apps/web/app/modules/Courses/Lesson/Lesson.page.tsx
index 654c67b3a..23aca4caf 100644
--- a/apps/web/app/modules/Courses/Lesson/Lesson.page.tsx
+++ b/apps/web/app/modules/Courses/Lesson/Lesson.page.tsx
@@ -71,6 +71,7 @@ export default function LessonPage() {
     currentLessonIndex < lessonsIds.length - 1 ? lessonsIds[currentLessonIndex + 1] : null;
 
   const isQuiz = data?.type === "quiz";
+  const isEnrolled = data?.enrolled;
 
   const getScorePercentage = () => {
     if (!data.quizScore || data.quizScore === 0 || !data.lessonItems.length) return "0%";
@@ -112,28 +113,30 @@ export default function LessonPage() {
           {data?.isSubmitted ? "Clear progress" : "Check answers"}
         </Button>
       )}
-      <div className="w-full flex flex-col sm:flex-row gap-4 justify-end">
-        <Link
-          to={previousLessonId ? `/course/${courseId}/lesson/${previousLessonId}` : "#"}
-          onClick={(e) => !previousLessonId && e.preventDefault()}
-          reloadDocument
-          replace
-        >
-          <Button variant="outline" className="w-full sm:w-[180px]" disabled={!previousLessonId}>
-            Previous lesson
-          </Button>
-        </Link>
-        <Link
-          to={nextLessonId ? `/course/${courseId}/lesson/${nextLessonId}` : "#"}
-          onClick={(e) => !nextLessonId && e.preventDefault()}
-          reloadDocument
-          replace
-        >
-          <Button className="w-full sm:w-[180px]" disabled={!nextLessonId}>
-            Next lesson
-          </Button>
-        </Link>
-      </div>
+      {isEnrolled && (
+        <div className="w-full flex flex-col sm:flex-row gap-4 justify-end">
+          <Link
+            to={previousLessonId ? `/course/${courseId}/lesson/${previousLessonId}` : "#"}
+            onClick={(e) => !previousLessonId && e.preventDefault()}
+            reloadDocument
+            replace
+          >
+            <Button variant="outline" className="w-full sm:w-[180px]" disabled={!previousLessonId}>
+              Previous lesson
+            </Button>
+          </Link>
+          <Link
+            to={nextLessonId ? `/course/${courseId}/lesson/${nextLessonId}` : "#"}
+            onClick={(e) => !nextLessonId && e.preventDefault()}
+            reloadDocument
+            replace
+          >
+            <Button className="w-full sm:w-[180px]" disabled={!nextLessonId}>
+              Next lesson
+            </Button>
+          </Link>
+        </div>
+      )}
     </>
   );
 }
diff --git a/apps/web/app/modules/Courses/Lesson/Overview.tsx b/apps/web/app/modules/Courses/Lesson/Overview.tsx
index 66a96f9e2..f6d3f701b 100644
--- a/apps/web/app/modules/Courses/Lesson/Overview.tsx
+++ b/apps/web/app/modules/Courses/Lesson/Overview.tsx
@@ -2,8 +2,10 @@ import { useParams } from "@remix-run/react";
 
 import { useLessonSuspense } from "~/api/queries/useLesson";
 import CardPlaceholder from "~/assets/placeholders/card-placeholder.jpg";
+import { CardBadge } from "~/components/CardBadge";
 import CourseProgress from "~/components/CourseProgress";
 import { Icon } from "~/components/Icon";
+import Viewer from "~/components/RichText/Viever";
 import { Card, CardContent } from "~/components/ui/card";
 import { cn } from "~/lib/utils";
 
@@ -22,20 +24,22 @@ export default function Overview() {
   const isQuizSubmitted = data.type === "quiz" && data.isSubmitted;
 
   const renderQuizProgressBadge = () => {
+    const badgeClasses = "absolute top-4 left-4 z-10";
+
     if (isQuizSubmitted) {
       return (
-        <>
+        <CardBadge variant="successOutlined" className={badgeClasses}>
           <Icon name="InputRoundedMarkerSuccess" />
-          <span className="text-success-800">Completed</span>
-        </>
+          Completed
+        </CardBadge>
       );
     }
 
     return (
-      <>
+      <CardBadge className={badgeClasses}>
         <Icon name="NotStartedRounded" />
-        <span className="text-neutral-900">Not started</span>
-      </>
+        Not started
+      </CardBadge>
     );
   };
 
@@ -45,11 +49,7 @@ export default function Overview() {
     <Card className="w-full pt-6 lg:pt-0 border-none drop-shadow-primary">
       <CardContent className="lg:p-8 flex flex-col align-center gap-6 2xl:flex-row">
         <div className="relative self-center w-full lg:max-w-[320px] aspect-video">
-          {isQuiz && (
-            <div className="absolute z-10 flex items-center body-sm-md px-2 gap-x-1 rounded-lg py-1 left-4 top-4 bg-white">
-              {quizBadge}
-            </div>
-          )}
+          {isQuiz && quizBadge}
           <img
             src={imageUrl}
             alt={title}
@@ -78,7 +78,7 @@ export default function Overview() {
             </div>
           )}
           <h5 className={cn("h5", { "mt-6": data.type !== "quiz" })}>{title}</h5>
-          <div className="body-base">{description}</div>
+          <Viewer content={description} className="body-base text-neutral-900" />
         </div>
       </CardContent>
     </Card>
diff --git a/apps/web/app/modules/Dashboard/Courses/CardCourseList.tsx b/apps/web/app/modules/Dashboard/Courses/CardCourseList.tsx
index 9e329b6de..e6a06797a 100644
--- a/apps/web/app/modules/Dashboard/Courses/CardCourseList.tsx
+++ b/apps/web/app/modules/Dashboard/Courses/CardCourseList.tsx
@@ -10,43 +10,11 @@ export const CardCourseList = ({ availableCourses }: CardCourseListProps) => {
   return (
     <div className="flex gap-6 flex-wrap *:h-auto">
       {availableCourses &&
-        availableCourses.map(
-          ({
-            authorEmail,
-            author,
-            title,
-            category,
-            description,
-            courseLessonCount,
-            id,
-            imageUrl,
-            enrolled,
-            priceInCents,
-            currency,
-          }) => {
-            if (!enrolled) {
-              return (
-                <CourseCard
-                  author={author}
-                  authorEmail={authorEmail}
-                  key={id}
-                  title={title}
-                  imageUrl={imageUrl}
-                  description={description}
-                  href={`/course/${id}`}
-                  category={category}
-                  courseLessonCount={courseLessonCount}
-                  enrolled={enrolled}
-                  priceInCents={priceInCents}
-                  currency={currency}
-                  withAuthor
-                />
-              );
-            }
+        availableCourses.map((course) => {
+          if (course.enrolled) return null;
 
-            return null;
-          },
-        )}
+          return <CourseCard {...course} key={course.id} />;
+        })}
     </div>
   );
 };
diff --git a/apps/web/app/modules/Dashboard/Courses/CourseCard.tsx b/apps/web/app/modules/Dashboard/Courses/CourseCard.tsx
index 7f0a00d7e..2123ac4ba 100644
--- a/apps/web/app/modules/Dashboard/Courses/CourseCard.tsx
+++ b/apps/web/app/modules/Dashboard/Courses/CourseCard.tsx
@@ -1,8 +1,10 @@
 import { Link } from "@remix-run/react";
 
 import CardPlaceholder from "~/assets/placeholders/card-placeholder.jpg";
+import { CardBadge } from "~/components/CardBadge";
 import CourseProgress from "~/components/CourseProgress";
 import { Gravatar } from "~/components/Gravatar";
+import { Icon } from "~/components/Icon";
 import { Avatar } from "~/components/ui/avatar";
 import { CategoryChip } from "~/components/ui/CategoryChip";
 import { useUserRole } from "~/hooks/useUserRole";
@@ -13,45 +15,28 @@ import { CourseCardTitle } from "./CourseCardTitle";
 
 import type { GetAllCoursesResponse } from "~/api/generated-api";
 
-type CourseType = GetAllCoursesResponse["data"][number];
-type CourseCardProps = Pick<
-  CourseType,
-  | "title"
-  | "category"
-  | "courseLessonCount"
-  | "imageUrl"
-  | "description"
-  | "enrolled"
-  | "priceInCents"
-  | "currency"
-  | "author"
-  | "authorEmail"
-> & {
-  href: string;
-  completedLessonCount?: number;
-  withAuthor?: boolean;
-};
+type CourseCardProps = GetAllCoursesResponse["data"][number];
 
 const CourseCard = ({
-  href,
-  title,
-  description,
+  author,
+  authorEmail = "",
   category,
-  imageUrl,
-  enrolled = false,
-  courseLessonCount,
   completedLessonCount,
+  courseLessonCount,
   currency,
+  description,
+  enrolled = false,
+  hasFreeLessons,
+  id,
+  imageUrl,
   priceInCents,
-  withAuthor = false,
-  author,
-  authorEmail = "",
+  title,
 }: CourseCardProps) => {
   const { isAdmin } = useUserRole();
 
   return (
     <Link
-      to={href}
+      to={`/course/${id}`}
       className={cn(
         "flex flex-col w-full max-w-[320px] overflow-hidden rounded-lg transition hover:shadow-primary h-auto bg-white lg:bg-none border",
         {
@@ -71,7 +56,7 @@ const CourseCard = ({
             (e.target as HTMLImageElement).src = CardPlaceholder;
           }}
         />
-        <div className="absolute top-4 left-4 right-4">
+        <div className="absolute top-4 left-4 flex flex-col gap-y-1 right-4">
           <CategoryChip
             category={category}
             color={cn({
@@ -79,28 +64,32 @@ const CourseCard = ({
               "text-primary-700": isAdmin || !enrolled,
             })}
           />
+          {hasFreeLessons && !enrolled && (
+            <CardBadge variant="successFilled">
+              <Icon name="FreeRight" className="w-4" />
+              Free Lessons!
+            </CardBadge>
+          )}
         </div>
       </div>
       <div className={cn("flex flex-col flex-grow p-4")}>
-        <div className={cn("flex flex-col flex-grow", { "gap-y-3": !withAuthor })}>
-          {enrolled && typeof completedLessonCount === "number" && (
+        <div className="flex flex-col flex-grow">
+          {enrolled && (
             <CourseProgress
               label="Course progress:"
               courseLessonCount={courseLessonCount}
               completedLessonCount={completedLessonCount}
             />
           )}
-          <div className={cn({ "mt-3": withAuthor })}>
+          <div className={cn({ "mt-3": author })}>
             <CourseCardTitle title={title} />
           </div>
-          {withAuthor && (
-            <div className="flex items-center gap-x-1.5 mt-1 mb-2">
-              <Avatar className="h-4 w-4">
-                <Gravatar email={authorEmail} />
-              </Avatar>
-              <span className="text-neutral-950">{author}</span>
-            </div>
-          )}
+          <div className="flex items-center gap-x-1.5 mt-1 mb-2">
+            <Avatar className="h-4 w-4">
+              <Gravatar email={authorEmail} />
+            </Avatar>
+            <span className="text-neutral-950">{author}</span>
+          </div>
           <div className="text-neutral-500 text-sm flex-grow">
             <span className="line-clamp-3">
               <div dangerouslySetInnerHTML={{ __html: description }} />
diff --git a/apps/web/app/modules/Dashboard/Courses/StudentCoursesCarousel.tsx b/apps/web/app/modules/Dashboard/Courses/StudentCoursesCarousel.tsx
index fffd739e1..cf95670b1 100644
--- a/apps/web/app/modules/Dashboard/Courses/StudentCoursesCarousel.tsx
+++ b/apps/web/app/modules/Dashboard/Courses/StudentCoursesCarousel.tsx
@@ -24,7 +24,7 @@ export const StudentCoursesCarousel = ({ studentCourses }: StudentCoursesCarouse
             key={studentCourse.id}
             className="max-w-[calc(100%-24px)] xs:max-w-[320px] *:h-full w-full shrink-0 mr-3 sm:mr-6 sm:last:mr-0"
           >
-            <CourseCard {...studentCourse} href={`/course/${studentCourse.id}`} withAuthor />
+            <CourseCard {...studentCourse} />
           </CarouselItem>
         );
       }
diff --git a/apps/web/app/modules/Dashboard/Dashboard.page.tsx b/apps/web/app/modules/Dashboard/Dashboard.page.tsx
index 1c9595e01..0d79f7424 100644
--- a/apps/web/app/modules/Dashboard/Dashboard.page.tsx
+++ b/apps/web/app/modules/Dashboard/Dashboard.page.tsx
@@ -111,9 +111,9 @@ export default function DashboardPage() {
       name: "category",
       type: "select",
       placeholder: "Categories",
-      options: categories?.map((cat) => ({
-        value: cat.title,
-        label: cat.title,
+      options: categories?.map(({ title }) => ({
+        value: title,
+        label: title,
       })),
     },
     {
diff --git a/apps/web/app/modules/Tutor/Tutor.page.tsx b/apps/web/app/modules/Tutor/Tutor.page.tsx
index 0b2ea615d..2be60a8ff 100644
--- a/apps/web/app/modules/Tutor/Tutor.page.tsx
+++ b/apps/web/app/modules/Tutor/Tutor.page.tsx
@@ -91,9 +91,7 @@ export default function TutorPage() {
             {/*TODO: Add filters*/}
           </div>
           <div className="flex flex-wrap lg:overflow-y-scroll lg:max-h-[calc(100dvh-260px)] gap-6 xl:gap-4 *:max-w-[250px]">
-            {tutorCourses?.map((course) => (
-              <CourseCard href={`/course/${course.id}`} key={course.id} {...course} />
-            ))}
+            {tutorCourses?.map((course) => <CourseCard key={course.id} {...course} />)}
           </div>
           <Button variant="outline" className="sr-only">
             Show more
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3ed130754..43513998d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,7 +43,7 @@ importers:
         version: 8.4.1
       '@golevelup/nestjs-stripe':
         specifier: ^0.8.2
-        version: 0.8.2(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(rxjs@7.8.1)(stripe@17.0.0)
+        version: 0.8.2(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(rxjs@7.8.1)(stripe@17.0.0)
       '@knaadh/nestjs-drizzle-postgres':
         specifier: ^1.0.0
         version: 1.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(drizzle-orm@0.31.2(@types/pg@8.11.6)(@types/react@18.3.4)(knex@2.5.1(mysql2@3.11.0)(pg@8.12.0))(mysql2@3.11.0)(pg@8.12.0)(postgres@3.4.4)(react@18.3.1))(postgres@3.4.4)
@@ -58,7 +58,7 @@ importers:
         version: 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/cqrs':
         specifier: ^10.2.7
-        version: 10.2.7(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)(rxjs@7.8.1)
+        version: 10.2.7(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/jwt':
         specifier: ^10.2.0
         version: 10.2.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))
@@ -73,13 +73,13 @@ importers:
         version: 10.4.4(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/websockets@10.4.4)(rxjs@7.8.1)
       '@nestjs/schedule':
         specifier: ^4.1.0
-        version: 4.1.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))
+        version: 4.1.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)
       '@nestjs/swagger':
         specifier: ^7.4.0
-        version: 7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)
+        version: 7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)
       '@nestjs/terminus':
         specifier: ^10.2.3
-        version: 10.2.3(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)(rxjs@7.8.1)
+        version: 10.2.3(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/websockets':
         specifier: ^10.4.4
         version: 10.4.4(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(@nestjs/platform-socket.io@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -127,7 +127,7 @@ importers:
         version: 3.3.7
       nestjs-typebox:
         specifier: 3.0.0-next.8
-        version: 3.0.0-next.8(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0))(@sinclair/typebox@0.32.34)(rxjs@7.8.1)
+        version: 3.0.0-next.8(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0))(@sinclair/typebox@0.32.34)(rxjs@7.8.1)
       nodemailer:
         specifier: ^6.9.14
         version: 6.9.14
@@ -167,7 +167,7 @@ importers:
         version: 10.0.0(chokidar@3.5.3)(typescript@5.5.4)
       '@nestjs/testing':
         specifier: ^10.0.0
-        version: 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0))
+        version: 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(@nestjs/platform-express@10.0.0)
       '@types/aws-sdk':
         specifier: ^2.7.0
         version: 2.7.0
@@ -225,6 +225,9 @@ importers:
       eslint-plugin-prettier:
         specifier: ^5.0.0
         version: 5.0.0(@types/eslint@8.56.11)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5)
+      eslint-plugin-unused-imports:
+        specifier: ^4.1.4
+        version: 4.1.4(@typescript-eslint/eslint-plugin@6.7.4(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)
       fishery:
         specifier: ^2.2.2
         version: 2.2.2
@@ -1264,9 +1267,11 @@ packages:
 
   '@esbuild-kit/core-utils@3.3.2':
     resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
+    deprecated: 'Merged into tsx: https://tsx.is'
 
   '@esbuild-kit/esm-loader@2.6.5':
     resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
+    deprecated: 'Merged into tsx: https://tsx.is'
 
   '@esbuild/aix-ppc64@0.19.11':
     resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==}
@@ -6564,6 +6569,15 @@ packages:
     peerDependencies:
       eslint: '>6.6.0'
 
+  eslint-plugin-unused-imports@4.1.4:
+    resolution: {integrity: sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0
+      eslint: ^9.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+
   eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
@@ -12980,7 +12994,7 @@ snapshots:
       lodash: 4.17.21
       nanoid: 3.3.7
 
-  '@golevelup/nestjs-discovery@4.0.1(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))':
+  '@golevelup/nestjs-discovery@4.0.1(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)':
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -12992,10 +13006,10 @@ snapshots:
       lodash: 4.17.21
       rxjs: 7.8.1
 
-  '@golevelup/nestjs-stripe@0.8.2(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(rxjs@7.8.1)(stripe@17.0.0)':
+  '@golevelup/nestjs-stripe@0.8.2(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(rxjs@7.8.1)(stripe@17.0.0)':
     dependencies:
       '@golevelup/nestjs-common': 2.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))
-      '@golevelup/nestjs-discovery': 4.0.1(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))
+      '@golevelup/nestjs-discovery': 4.0.1(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)
       '@golevelup/nestjs-modules': 0.7.1(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(rxjs@7.8.1)
       stripe: 17.0.0
     transitivePeerDependencies:
@@ -13377,7 +13391,7 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@nestjs/cqrs@10.2.7(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)(rxjs@7.8.1)':
+  '@nestjs/cqrs@10.2.7(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)(rxjs@7.8.1)':
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -13425,7 +13439,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@nestjs/schedule@4.1.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))':
+  '@nestjs/schedule@4.1.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)':
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -13454,7 +13468,7 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)':
+  '@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)':
     dependencies:
       '@microsoft/tsdoc': 0.15.0
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -13466,7 +13480,7 @@ snapshots:
       reflect-metadata: 0.2.0
       swagger-ui-dist: 5.17.14
 
-  '@nestjs/terminus@10.2.3(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)(rxjs@7.8.1)':
+  '@nestjs/terminus@10.2.3(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)(rxjs@7.8.1)':
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -13475,7 +13489,7 @@ snapshots:
       reflect-metadata: 0.2.0
       rxjs: 7.8.1
 
-  '@nestjs/testing@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0))':
+  '@nestjs/testing@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(@nestjs/platform-express@10.0.0)':
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
@@ -18479,7 +18493,7 @@ snapshots:
       debug: 4.3.6
       enhanced-resolve: 5.17.1
       eslint: 8.57.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.28.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.7.6
@@ -18491,7 +18505,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.28.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -18522,7 +18536,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.28.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       has: 1.0.4
       is-core-module: 2.15.0
       is-glob: 4.0.3
@@ -18642,6 +18656,12 @@ snapshots:
       dotenv: 16.0.3
       eslint: 8.57.0
 
+  eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@6.7.4(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0):
+    dependencies:
+      eslint: 8.57.0
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 6.7.4(@typescript-eslint/parser@6.7.4(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)
+
   eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
@@ -21127,11 +21147,11 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  nestjs-typebox@3.0.0-next.8(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0))(@sinclair/typebox@0.32.34)(rxjs@7.8.1):
+  nestjs-typebox@3.0.0-next.8(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(@nestjs/swagger@7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0))(@sinclair/typebox@0.32.34)(rxjs@7.8.1):
     dependencies:
       '@nestjs/common': 10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1)
       '@nestjs/core': 10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1)
-      '@nestjs/swagger': 7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/platform-express@10.0.0)(@nestjs/websockets@10.4.4)(reflect-metadata@0.2.0)(rxjs@7.8.1))(reflect-metadata@0.2.0)
+      '@nestjs/swagger': 7.4.0(@nestjs/common@10.0.0(reflect-metadata@0.2.0)(rxjs@7.8.1))(@nestjs/core@10.0.0)(reflect-metadata@0.2.0)
       '@sinclair/typebox': 0.32.34
       rxjs: 7.8.1