diff --git a/apps/api/src/courses/course.service.ts b/apps/api/src/courses/course.service.ts
index a68b9972..c8edce99 100644
--- a/apps/api/src/courses/course.service.ts
+++ b/apps/api/src/courses/course.service.ts
@@ -447,7 +447,7 @@ export class CourseService {
       .select({
         id: courses.id,
         title: courses.title,
-        thumbnailUrl: sql<string>`COALESCE(${courses.thumbnailS3Key}, '')`,
+        thumbnailS3Key: sql<string>`COALESCE(${courses.thumbnailS3Key}, '')`,
         category: categories.title,
         categoryId: categories.id,
         description: sql<string>`${courses.description}`,
@@ -489,7 +489,7 @@ export class CourseService {
       return await this.fileService.getFileUrl(url);
     };
 
-    const thumbnailUrl = await getImageUrl(course.thumbnailUrl);
+    const thumbnailS3SingedUrl = await getImageUrl(course.thumbnailS3Key);
 
     const updatedCourseLessonList = await Promise.all(
       courseChapterList?.map(async (chapter) => {
@@ -507,7 +507,7 @@ export class CourseService {
 
     return {
       ...course,
-      thumbnailUrl,
+      thumbnailS3SingedUrl,
       chapters: updatedCourseLessonList ?? [],
     };
   }
@@ -517,7 +517,7 @@ export class CourseService {
       .select({
         id: courses.id,
         title: courses.title,
-        thumbnailUrl: sql<string>`${courses.thumbnailS3Key}`,
+        thumbnailS3Key: sql<string>`${courses.thumbnailS3Key}`,
         category: categories.title,
         categoryId: categories.id,
         description: sql<string>`${courses.description}`,
@@ -556,11 +556,11 @@ export class CourseService {
       return await this.fileService.getFileUrl(url);
     };
 
-    const thumbnailUrl = await getImageUrl(course.thumbnailUrl);
+    const thumbnailS3SingedUrl = await getImageUrl(course.thumbnailS3Key);
 
     return {
       ...course,
-      thumbnailUrl,
+      thumbnailS3SingedUrl,
       chapters: courseChapterList,
     };
   }
diff --git a/apps/api/src/courses/schemas/showCourseCommon.schema.ts b/apps/api/src/courses/schemas/showCourseCommon.schema.ts
index 3c0ca82c..c27c8fba 100644
--- a/apps/api/src/courses/schemas/showCourseCommon.schema.ts
+++ b/apps/api/src/courses/schemas/showCourseCommon.schema.ts
@@ -20,6 +20,8 @@ export const commonShowCourseSchema = Type.Object({
   isScorm: Type.Optional(Type.Boolean()),
   priceInCents: Type.Number(),
   thumbnailUrl: Type.Optional(Type.String()),
+  thumbnailS3Key: Type.Optional(Type.String()),
+  thumbnailS3SingedUrl: Type.Optional(Type.String()),
   title: Type.String(),
 });
 
diff --git a/apps/api/src/seed/seed-helpers.ts b/apps/api/src/seed/seed-helpers.ts
index 71fb1f25..94a7044a 100644
--- a/apps/api/src/seed/seed-helpers.ts
+++ b/apps/api/src/seed/seed-helpers.ts
@@ -95,8 +95,8 @@ export async function createNiceCourses(
               lessonData.type === LESSON_TYPES.presentation
                 ? "pptx"
                 : lessonData.type === LESSON_TYPES.video
-                ? "mp4"
-                : null,
+                  ? "mp4"
+                  : null,
             chapterId: chapter.id,
             createdAt: createdAt,
             updatedAt: createdAt,
diff --git a/apps/api/src/swagger/api-schema.json b/apps/api/src/swagger/api-schema.json
index fe492725..b24c36be 100644
--- a/apps/api/src/swagger/api-schema.json
+++ b/apps/api/src/swagger/api-schema.json
@@ -3711,6 +3711,12 @@
               "thumbnailUrl": {
                 "type": "string"
               },
+              "thumbnailS3Key": {
+                "type": "string"
+              },
+              "thumbnailS3SingedUrl": {
+                "type": "string"
+              },
               "title": {
                 "type": "string"
               }
@@ -3857,6 +3863,12 @@
               "thumbnailUrl": {
                 "type": "string"
               },
+              "thumbnailS3Key": {
+                "type": "string"
+              },
+              "thumbnailS3SingedUrl": {
+                "type": "string"
+              },
               "title": {
                 "type": "string"
               }
@@ -4003,6 +4015,12 @@
               "thumbnailUrl": {
                 "type": "string"
               },
+              "thumbnailS3Key": {
+                "type": "string"
+              },
+              "thumbnailS3SingedUrl": {
+                "type": "string"
+              },
               "title": {
                 "type": "string"
               }
diff --git a/apps/web/app/api/generated-api.ts b/apps/web/app/api/generated-api.ts
index b4f9d4a9..409f1d53 100644
--- a/apps/web/app/api/generated-api.ts
+++ b/apps/web/app/api/generated-api.ts
@@ -467,6 +467,8 @@ export interface GetCourseResponse {
     isScorm?: boolean;
     priceInCents: number;
     thumbnailUrl?: string;
+    thumbnailS3Key?: string;
+    thumbnailS3SingedUrl?: string;
     title: string;
   };
 }
@@ -506,6 +508,8 @@ export interface GetCourseByIdResponse {
     isScorm?: boolean;
     priceInCents: number;
     thumbnailUrl?: string;
+    thumbnailS3Key?: string;
+    thumbnailS3SingedUrl?: string;
     title: string;
   };
 }
@@ -545,6 +549,8 @@ export interface GetBetaCourseByIdResponse {
     isScorm?: boolean;
     priceInCents: number;
     thumbnailUrl?: string;
+    thumbnailS3Key?: string;
+    thumbnailS3SingedUrl?: string;
     title: string;
   };
 }
@@ -1687,8 +1693,6 @@ export class API<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      */
     courseControllerGetStudentCourses: (
       query?: {
-        /** @format uuid */
-        excludeCourseId?: string;
         title?: string;
         category?: string;
         author?: string;
diff --git a/apps/web/app/modules/Admin/EditCourse/CourseSettings/CourseSettings.tsx b/apps/web/app/modules/Admin/EditCourse/CourseSettings/CourseSettings.tsx
index 445ef78c..f51e1f6c 100644
--- a/apps/web/app/modules/Admin/EditCourse/CourseSettings/CourseSettings.tsx
+++ b/apps/web/app/modules/Admin/EditCourse/CourseSettings/CourseSettings.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { useUploadFile } from "~/api/mutations/admin/useUploadFile";
 import { useCategoriesSuspense } from "~/api/queries/useCategories";
@@ -26,30 +26,34 @@ type CourseSettingsProps = {
   title?: string;
   description?: string;
   categoryId?: string;
-  imageUrl?: string;
+  thumbnailS3SingedUrl?: string;
+  thumbnailS3Key?: string;
 };
 const CourseSettings = ({
   courseId,
   title,
   description,
   categoryId,
-  imageUrl,
+  thumbnailS3SingedUrl,
+  thumbnailS3Key,
 }: CourseSettingsProps) => {
   const { form, onSubmit } = useCourseSettingsForm({
     title,
     description,
     categoryId,
-    imageUrl,
+    thumbnailS3Key,
     courseId: courseId || "",
   });
   const { data: categories } = useCategoriesSuspense();
   const [isUploading, setIsUploading] = useState(false);
   const { mutateAsync: uploadFile } = useUploadFile();
   const isFormValid = form.formState.isValid;
+  const [displayThumbnailUrl, setDisplayThumbnailUrl] = useState<string | undefined>(
+    thumbnailS3SingedUrl || undefined,
+  );
 
   const watchedTitle = form.watch("title");
   const watchedDescription = form.watch("description");
-  const watchedImageUrl = form.watch("imageUrl");
   const watchedCategoryId = form.getValues("categoryId");
 
   const categoryName = useMemo(() => {
@@ -61,7 +65,8 @@ const CourseSettings = ({
       setIsUploading(true);
       try {
         const result = await uploadFile({ file, resource: "course" });
-        form.setValue("imageUrl", result.fileUrl, { shouldValidate: true });
+        form.setValue("thumbnailS3Key", result.fileKey, { shouldValidate: true });
+        setDisplayThumbnailUrl(result.fileUrl);
       } catch (error) {
         console.error("Error uploading image:", error);
       } finally {
@@ -71,6 +76,11 @@ const CourseSettings = ({
     [form, uploadFile],
   );
 
+  const removeThumbnail = () => {
+    form.setValue("thumbnailS3Key", "");
+    setDisplayThumbnailUrl(undefined);
+  };
+
   return (
     <div className="w-full flex h-full gap-x-6">
       <div className="w-full basis-full">
@@ -121,16 +131,16 @@ const CourseSettings = ({
               />
               <FormField
                 control={form.control}
-                name="imageUrl"
+                name="thumbnailS3Key"
                 render={({ field }) => (
                   <FormItem className="max-h-[440px]">
-                    <Label htmlFor="imageUrl">Thumbnail</Label>
+                    <Label htmlFor="thumbnailS3Key">Thumbnail</Label>
                     <FormControl>
                       <ImageUploadInput
                         field={field}
                         handleImageUpload={handleImageUpload}
                         isUploading={isUploading}
-                        imageUrl={imageUrl}
+                        imageUrl={displayThumbnailUrl}
                       />
                     </FormControl>
                     {isUploading && <p>Uploading image...</p>}
@@ -139,11 +149,8 @@ const CourseSettings = ({
                 )}
               />
               <div className="flex items-center justify-start gap-x-2">
-                {watchedImageUrl && (
-                  <Button
-                    onClick={() => form.setValue("imageUrl", "")}
-                    className="bg-red-500 text-white py-2 px-6"
-                  >
+                {displayThumbnailUrl && (
+                  <Button onClick={removeThumbnail} className="bg-red-500 text-white py-2 px-6">
                     <Icon name="TrashIcon" className="mr-2" />
                     Remove Thumbnail
                   </Button>
@@ -160,7 +167,7 @@ const CourseSettings = ({
       </div>
       <div className="max-w-[480px] w-full">
         <CourseCardPreview
-          imageUrl={watchedImageUrl}
+          imageUrl={displayThumbnailUrl}
           title={watchedTitle}
           description={watchedDescription}
           category={categoryName}
diff --git a/apps/web/app/modules/Admin/EditCourse/CourseSettings/hooks/useCourseSettingsForm.tsx b/apps/web/app/modules/Admin/EditCourse/CourseSettings/hooks/useCourseSettingsForm.tsx
index 2f02f844..d407b52f 100644
--- a/apps/web/app/modules/Admin/EditCourse/CourseSettings/hooks/useCourseSettingsForm.tsx
+++ b/apps/web/app/modules/Admin/EditCourse/CourseSettings/hooks/useCourseSettingsForm.tsx
@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 
-import { useDeleteFile } from "~/api/mutations/admin/useDeleteFile";
 import { useUpdateCourse } from "~/api/mutations/admin/useUpdateCourse";
 import { courseQueryOptions } from "~/api/queries/admin/useCourseById";
 import { queryClient } from "~/api/queryClient";
@@ -14,7 +13,7 @@ type CourseSettingsProps = {
   title?: string;
   description?: string;
   categoryId?: string;
-  imageUrl?: string;
+  thumbnailS3Key?: string;
   courseId: string;
 };
 
@@ -22,38 +21,27 @@ export const useCourseSettingsForm = ({
   title,
   description,
   categoryId,
-  imageUrl,
+  thumbnailS3Key,
   courseId,
 }: CourseSettingsProps) => {
   const { mutateAsync: updateCourse } = useUpdateCourse();
 
-  const { mutateAsync: deleteOldFile } = useDeleteFile();
   const form = useForm<CourseSettingsFormValues>({
     resolver: zodResolver(courseSettingsFormSchema),
     defaultValues: {
       title: title || "",
       description: description || "",
       categoryId: categoryId || "",
-      imageUrl: imageUrl || "",
+      thumbnailS3Key: thumbnailS3Key || "",
     },
   });
 
-  const newImageUrl = form.getValues("imageUrl");
-  const oldImageUrl = imageUrl ?? "";
-
-  const oldImageExist = Boolean(oldImageUrl);
-  const newImageExist = Boolean(newImageUrl);
-  const imageUrlChanged = oldImageExist && newImageExist && newImageUrl !== oldImageUrl;
-
   const onSubmit = async (data: UpdateCourseBody) => {
     updateCourse({
       data: { ...data },
       courseId,
     }).then(() => {
       queryClient.invalidateQueries(courseQueryOptions(courseId));
-      if (imageUrlChanged) {
-        deleteOldFile(oldImageUrl);
-      }
     });
   };
 
diff --git a/apps/web/app/modules/Admin/EditCourse/CourseSettings/validators/courseSettingsFormSchema.ts b/apps/web/app/modules/Admin/EditCourse/CourseSettings/validators/courseSettingsFormSchema.ts
index dc305dfa..e373c37a 100644
--- a/apps/web/app/modules/Admin/EditCourse/CourseSettings/validators/courseSettingsFormSchema.ts
+++ b/apps/web/app/modules/Admin/EditCourse/CourseSettings/validators/courseSettingsFormSchema.ts
@@ -4,7 +4,7 @@ export const courseSettingsFormSchema = z.object({
   title: z.string().min(2, "Title must be at least 2 characters."),
   description: z.string().min(2, "Description must be at least 2 characters."),
   categoryId: z.string().min(1, "Category is required"),
-  imageUrl: z.union([z.string().url("Invalid image URL"), z.string().length(0)]).optional(),
+  thumbnailS3Key: z.string().optional(),
 });
 
 export type CourseSettingsFormValues = z.infer<typeof courseSettingsFormSchema>;
diff --git a/apps/web/app/modules/Admin/EditCourse/EditCourse.tsx b/apps/web/app/modules/Admin/EditCourse/EditCourse.tsx
index 3a92ebfa..3e6c54db 100644
--- a/apps/web/app/modules/Admin/EditCourse/EditCourse.tsx
+++ b/apps/web/app/modules/Admin/EditCourse/EditCourse.tsx
@@ -77,7 +77,8 @@ const EditCourse = () => {
           title={course?.title}
           description={course?.description}
           categoryId={course?.categoryId}
-          imageUrl={course?.thumbnailUrl}
+          thumbnailS3SingedUrl={course?.thumbnailS3SingedUrl}
+          thumbnailS3Key={course?.thumbnailS3Key}
         />
       </TabsContent>
       <TabsContent value="Curriculum" className="h-full overflow-hidden">