diff --git a/data/defaults.yaml b/data/defaults.yaml
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1873,6 +1873,7 @@
 swh::deploy::scheduler::archive::conf_file: "%{hiera('swh::deploy::scheduler::archive::conf_dir')}/elastic.yml"
 swh::deploy::scheduler::archive::user: "%{hiera('swh::deploy::scheduler::user')}"
 swh::deploy::scheduler::archive::config:
+  scheduler: "%{alias('swh::remote_service::scheduler::config::writable')}"
   storage_nodes:
     - host: esnode2.internal.softwareheritage.org
       port: 9200
diff --git a/site-modules/profile/manifests/swh/deploy/scheduler.pp b/site-modules/profile/manifests/swh/deploy/scheduler.pp
--- a/site-modules/profile/manifests/swh/deploy/scheduler.pp
+++ b/site-modules/profile/manifests/swh/deploy/scheduler.pp
@@ -149,7 +149,7 @@
   cron {'archive_completed_oneshot_and_disabled_recurring_tasks':
     ensure   => present,
     user     => $user,
-    command  => "/usr/bin/python3 -m swh.scheduler.cli task archive",
+    command  => "/usr/bin/swh scheduler --config-file ${archive_config_file} task archive",
     hour     => '*',
     minute   => fqdn_rand(60, 'archival_tasks_minute'),
     require  => [
diff --git a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
--- a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
+++ b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
@@ -12,7 +12,7 @@
 Group=<%= @group %>
 Type=simple
 Environment=SWH_LOG_TARGET=journal
-ExecStart=/usr/bin/swh-scheduler --config-file <%= @config_file %> --log-level <%= @listener_log_level %> listener
+ExecStart=/usr/bin/swh --log-level <%= @listener_log_level %> scheduler --config-file <%= @config_file %> listener
 Restart=always
 RestartSec=10
 
diff --git a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
--- a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
+++ b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
@@ -12,7 +12,7 @@
 Group=<%= @group %>
 Type=simple
 Environment=SWH_LOG_TARGET=journal
-ExecStart=/usr/bin/swh-scheduler --config-file <%= @config_file %> --log-level <%= @runner_log_level %> runner --period 10
+ExecStart=/usr/bin/swh --log-level <%= @runner_log_level %> scheduler --config-file <%= @config_file %> runner --period 10
 Restart=always
 RestartSec=10