diff --git a/tubesync/sync/signals.py b/tubesync/sync/signals.py
index 30f6694f..0b19c360 100644
--- a/tubesync/sync/signals.py
+++ b/tubesync/sync/signals.py
@@ -54,7 +54,7 @@ def source_post_save(sender, instance, created, **kwargs):
         if instance.source_type != Source.SOURCE_TYPE_YOUTUBE_PLAYLIST and instance.copy_channel_images:
             download_source_images(
                 str(instance.pk),
-                priority=0,
+                priority=2,
                 verbose_name=verbose_name.format(instance.name)
             )
         if instance.index_schedule > 0:
@@ -69,17 +69,28 @@ def source_post_save(sender, instance, created, **kwargs):
                 verbose_name=verbose_name.format(instance.name),
                 remove_existing_tasks=True
             )
-    verbose_name = _('Renaming all media for source "{}"')
-    rename_all_media_for_source(
-        str(instance.pk),
-        priority=0,
-        verbose_name=verbose_name.format(instance.name),
-        remove_existing_tasks=True
+    # Check settings before any rename tasks are scheduled
+    rename_sources_setting = settings.RENAME_SOURCES or list()
+    create_rename_task = (
+        (
+            instance.directory and
+            instance.directory in rename_sources_setting
+        ) or
+        settings.RENAME_ALL_SOURCES
     )
+    if create_rename_task:
+        verbose_name = _('Renaming all media for source "{}"')
+        rename_all_media_for_source(
+            str(instance.pk),
+            queue=str(instance.pk),
+            priority=1,
+            verbose_name=verbose_name.format(instance.name),
+            remove_existing_tasks=False
+        )
     verbose_name = _('Checking all media for source "{}"')
     save_all_media_for_source(
         str(instance.pk),
-        priority=1,
+        priority=2,
         verbose_name=verbose_name.format(instance.name),
         remove_existing_tasks=True
     )