diff --git a/tubesync/sync/signals.py b/tubesync/sync/signals.py
index 998ab3a3..0958ba30 100644
--- a/tubesync/sync/signals.py
+++ b/tubesync/sync/signals.py
@@ -227,11 +227,7 @@ def media_post_save(sender, instance, created, **kwargs):
             settings.RENAME_ALL_SOURCES
         )
         if create_rename_task:
-            verbose_name = _('Renaming media for: {}: "{}"')
-            rename_media(
-                str(media.pk),
-                verbose_name=verbose_name.format(media.key, media.name),
-            )
+            rename_media(str(media.pk))
 
     # If the media is missing metadata schedule it to be downloaded
     if not (media.skip or media.has_metadata or existing_media_metadata_task):
@@ -291,7 +287,6 @@ def media_pre_delete(sender, instance, **kwargs):
     log.info(f'Deleting tasks for media: {instance.name}')
     delete_task_by_media('sync.tasks.download_media', (str(instance.pk),))
     delete_task_by_media('sync.tasks.download_media_metadata', (str(instance.pk),))
-    delete_task_by_media('sync.tasks.rename_media', (str(instance.pk),))
     delete_task_by_media('sync.tasks.wait_for_media_premiere', (str(instance.pk),))
     thumbnail_url = instance.thumbnail
     if thumbnail_url:
diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 97a63515..c8896ee3 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -66,7 +66,6 @@ def map_task_to_instance(task):
         'sync.tasks.download_media': Media,
         'sync.tasks.download_media_metadata': Media,
         'sync.tasks.save_all_media_for_source': Source,
-        'sync.tasks.rename_media': Media,
         'sync.tasks.rename_all_media_for_source': Source,
         'sync.tasks.wait_for_media_premiere': Media,
         'sync.tasks.delete_all_media_for_source': Source,
@@ -906,12 +905,12 @@ def refresh_formats(media_id):
             save_model(media)
 
 
-@background(schedule=dict(priority=20, run_at=60), queue=Val(TaskQueue.FS), remove_existing_tasks=True)
+@db_task(delay=60, priority=80, retries=5, retry_delay=60, queue=Val(TaskQueue.FS))
 def rename_media(media_id):
     try:
         media = Media.objects.get(pk=media_id)
     except Media.DoesNotExist as e:
-        raise InvalidTaskError(_('no such media')) from e
+        raise CancelExecution(_('no such media'), retry=False) from e
     else:
         with atomic():
             media.rename_files()