diff --git a/tubesync/sync/signals.py b/tubesync/sync/signals.py
index 165a1be7..90b39480 100644
--- a/tubesync/sync/signals.py
+++ b/tubesync/sync/signals.py
@@ -92,12 +92,10 @@ def source_pre_save(sender, instance, **kwargs):
         verbose_name = _('Index media from source "{}"')
         index_source_task(
             str(instance.pk),
-            schedule=instance.index_schedule,
-            repeat=instance.index_schedule,
             queue=str(instance.pk),
-            priority=10,
+            repeat=instance.index_schedule,
+            schedule=instance.index_schedule,
             verbose_name=verbose_name.format(instance.name),
-            remove_existing_tasks=True
         )
 
 
@@ -108,14 +106,14 @@ def source_post_save(sender, instance, created, **kwargs):
         verbose_name = _('Check download directory exists for source "{}"')
         check_source_directory_exists(
             str(instance.pk),
-            priority=0,
-            verbose_name=verbose_name.format(instance.name)
+            queue=str(instance.pk),
+            verbose_name=verbose_name.format(instance.name),
         )
         if instance.source_type != Val(YouTube_SourceType.PLAYLIST) and instance.copy_channel_images:
             download_source_images(
                 str(instance.pk),
-                priority=5,
-                verbose_name=verbose_name.format(instance.name)
+                queue=str(instance.pk),
+                verbose_name=verbose_name.format(instance.name),
             )
         if instance.index_schedule > 0:
             delete_task_by_source('sync.tasks.index_source_task', instance.pk)
@@ -123,20 +121,17 @@ def source_post_save(sender, instance, created, **kwargs):
             verbose_name = _('Index media from source "{}"')
             index_source_task(
                 str(instance.pk),
-                schedule=600,
-                repeat=instance.index_schedule,
                 queue=str(instance.pk),
-                priority=10,
+                repeat=instance.index_schedule,
+                schedule=600,
                 verbose_name=verbose_name.format(instance.name),
-                remove_existing_tasks=True
             )
 
     verbose_name = _('Checking all media for source "{}"')
     save_all_media_for_source(
         str(instance.pk),
-        priority=25,
+        queue=str(instance.pk),
         verbose_name=verbose_name.format(instance.name),
-        remove_existing_tasks=True
     )
 
 
@@ -157,7 +152,6 @@ def source_pre_delete(sender, instance, **kwargs):
     delete_all_media_for_source(
         str(instance.pk),
         str(instance.name),
-        priority=1,
         verbose_name=verbose_name.format(instance.name),
     )
     # Try to do it all immediately
@@ -245,9 +239,7 @@ def media_post_save(sender, instance, created, **kwargs):
             rename_media(
                 str(media.pk),
                 queue=str(media.pk),
-                priority=20,
                 verbose_name=verbose_name.format(media.key, media.name),
-                remove_existing_tasks=True
             )
 
     # If the media is missing metadata schedule it to be downloaded
@@ -256,9 +248,8 @@ def media_post_save(sender, instance, created, **kwargs):
         verbose_name = _('Downloading metadata for "{}"')
         download_media_metadata(
             str(instance.pk),
-            priority=20,
+            queue=str(media.pk),
             verbose_name=verbose_name.format(instance.pk),
-            remove_existing_tasks=True
         )
     # If the media is missing a thumbnail schedule it to be downloaded (unless we are skipping this media)
     if not instance.thumb_file_exists:
@@ -272,10 +263,8 @@ def media_post_save(sender, instance, created, **kwargs):
             download_media_thumbnail(
                 str(instance.pk),
                 thumbnail_url,
-                queue=str(instance.source.pk),
-                priority=15,
+                queue=str(instance.pk),
                 verbose_name=verbose_name.format(instance.name),
-                remove_existing_tasks=True
             )
     # If the media has not yet been downloaded schedule it to be downloaded
     if not (instance.media_file_exists or instance.filepath.exists() or existing_media_download_task):
@@ -289,10 +278,8 @@ def media_post_save(sender, instance, created, **kwargs):
         verbose_name = _('Downloading media for "{}"')
         download_media(
             str(instance.pk),
-            queue=str(instance.source.pk),
-            priority=15,
+            queue=str(instance.pk),
             verbose_name=verbose_name.format(instance.name),
-            remove_existing_tasks=True
         )
     # Save the instance if any changes were required
     if skip_changed or can_download_changed: