diff --git a/apps/core/__pycache__/signals.cpython-39.pyc b/apps/core/__pycache__/signals.cpython-39.pyc
index db66d6991f78e07ae799763c5687816f185bb061..2a69c16acbb75285c4e42945336ffc47e1937207 100644
Binary files a/apps/core/__pycache__/signals.cpython-39.pyc and b/apps/core/__pycache__/signals.cpython-39.pyc differ
diff --git a/apps/core/__pycache__/utils.cpython-39.pyc b/apps/core/__pycache__/utils.cpython-39.pyc
index 95a2501b7e72ceeccaac4029419b89d0b09305e6..5f76382da15298c1967999c5853a4027976e5dd0 100644
Binary files a/apps/core/__pycache__/utils.cpython-39.pyc and b/apps/core/__pycache__/utils.cpython-39.pyc differ
diff --git a/apps/core/signals.py b/apps/core/signals.py
index 379e5f612aaf56511ca0a31c26389f9c8e865603..739c0b1c0d5cba6ca0187e5dbe862db6a6440040 100644
--- a/apps/core/signals.py
+++ b/apps/core/signals.py
@@ -12,10 +12,10 @@ def generate_default_thumbnail_for_video(sender, instance, **kwargs):
     if not instance.thumbnail and instance.local_file:
         if os.path.isfile(instance.local_file.path):
             thumbnail_name = utils.generate_thumbnail(instance.local_file)
-            thumbnail_path = f'{settings.MEDIA_ROOT}videos/{instance.id}/{thumbnail_name}'
+            key = f'videos/{thumbnail_name}'
+            thumbnail_path = f'{settings.MEDIA_ROOT}{key}'
 
             content = utils.get_thumbnail_content(thumbnail_path)
-            key = f'videos/{instance.id}/{thumbnail_name}'
             content_type = 'image/jpeg'
             instance.thumbnail = s3_uploader.upload_file(content, key, content_type)
 
diff --git a/apps/core/tasks.py b/apps/core/tasks.py
index dd59aefe48a183525e797ad8b25b1f41bced7ebc..6d7eb645755884aa7ec2dbb4fe2a9e83532ed6bd 100644
--- a/apps/core/tasks.py
+++ b/apps/core/tasks.py
@@ -2,6 +2,7 @@ import os
 
 from .models import Video, READY
 from .s3_uploader import upload_file
+from .utils import asset_upload
 
 from cp_video.celery import app
 
@@ -12,7 +13,7 @@ def send_video_to_s3():
 
     for local_video in local_videos:
         video_name = local_video.local_file.name.split('/')[-1]
-        key = f'videos/{local_video.id}/{video_name}'
+        key = asset_upload(local_video, video_name)
         content = local_video.local_file.read()
 
         local_video.s3_file = upload_file(content, key, 'video/mp4')
diff --git a/apps/core/utils.py b/apps/core/utils.py
index 45dca4a7cc0cc28bf3390f6df111ffbb669dba19..75086ba9364aedd1c5848bba62efcbcc13373755 100644
--- a/apps/core/utils.py
+++ b/apps/core/utils.py
@@ -7,7 +7,7 @@ from moviepy.editor import VideoFileClip
 
 
 def asset_upload(instance, filename):
-    return f'videos/{instance.id}/{filename}'
+    return f'videos/{filename}'
 
 
 def generate_thumbnail(video):