diff --git a/src/chapter/chapter.service.ts b/src/chapter/chapter.service.ts
index 709afd51..b5871f12 100644
--- a/src/chapter/chapter.service.ts
+++ b/src/chapter/chapter.service.ts
@@ -226,7 +226,9 @@ export class ChapterService {
     );
 
     const uploadFiles = allowedFiles.map((f) => {
-      const keyName = `manga-${mangaId}/chapter-${chapterNumber}/lang-${f.languageId}/${f.fileName}`;
+      const s3SubFolder =
+        this.configService.get<string>('aws.s3SubFolder') || 'images';
+      const keyName = `${s3SubFolder}/manga-${mangaId}/chapter-${chapterNumber}/lang-${f.languageId}/${f.fileName}`;
       return {
         name: f.fileName,
         key_name: keyName,
diff --git a/src/files/files.service.ts b/src/files/files.service.ts
index 7e4b78fd..b6de5325 100644
--- a/src/files/files.service.ts
+++ b/src/files/files.service.ts
@@ -57,7 +57,9 @@ export class FilesService {
     if (!thumbnail.type.includes('image')) {
       throw Error('thumbnail not valid');
     }
-    const keyName = `manga-${mangaId}/chapter-${chapterNumber}/thumbnail.${thumbnail.fileName
+    const s3SubFolder =
+      this.configService.get<string>('aws.s3SubFolder') || 'images';
+    const keyName = `${s3SubFolder}/manga-${mangaId}/chapter-${chapterNumber}/thumbnail.${thumbnail.fileName
       .split('.')
       .pop()}`;
     const filePath = thumbnail.fullPath;
@@ -81,7 +83,9 @@ export class FilesService {
     // const keyName = `manga-${mangaId}/${f.fieldname}.${f.originalname
     //   .split('.')
     //   .pop()}`;
-    const keyName = `manga-${mangaId}/${f.originalname}`;
+    const s3SubFolder =
+      this.configService.get<string>('aws.s3SubFolder') || 'images';
+    const keyName = `${s3SubFolder}/manga-${mangaId}/${f.originalname}`;
 
     await this.uploadToS3(keyName, f.buffer);
     return new URL(keyName, this.configService.get<string>('aws.queryEndpoint'))