diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1,5 @@
 swh.core >= 0.0.37
 swh.model >= 0.0.27
-swh.scheduler >= 0.0.14
+swh.scheduler >= 0.0.39
 swh.storage >= 0.0.83
 swh.loader.core >= 0.0.35
diff --git a/swh/loader/dir/tasks.py b/swh/loader/dir/tasks.py
--- a/swh/loader/dir/tasks.py
+++ b/swh/loader/dir/tasks.py
@@ -3,24 +3,20 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from celery import current_app as app
+
 from swh.loader.dir.loader import DirLoader
-from swh.scheduler.task import Task
 
 
-class LoadDirRepository(Task):
+@app.task(name=__name__ + '.LoadDirRepository')
+def load_directory(dir_path, origin, visit_date, revision, release,
+                   branch_name=None):
     """Import a directory to Software Heritage
 
-    """
-    task_queue = 'swh_loader_dir'
-
-    def run_task(self, *, dir_path, origin, visit_date, revision, release,
-                 branch_name=None):
-        """Import a directory dir_path with origin at visit_date time.
-        Providing the revision, release, and occurrences.
+    Import a directory dir_path with origin at visit_date time.
+    Providing the revision, release, and occurrences.
 
-        """
-        loader = DirLoader()
-        loader.log = self.log
-        return loader.load(dir_path=dir_path, origin=origin,
-                           visit_date=visit_date, revision=revision,
-                           release=release, branch_name=branch_name)
+    """
+    return DirLoader().load(dir_path=dir_path, origin=origin,
+                            visit_date=visit_date, revision=revision,
+                            release=release, branch_name=branch_name)