diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml
index f8d8281a..cece91a5 100644
--- a/data/hostname/moma.softwareheritage.org.yaml
+++ b/data/hostname/moma.softwareheritage.org.yaml
@@ -1,100 +1,100 @@
 networks:
   eth0:
     address: 128.93.166.15
     netmask: 26
     gateway: 128.93.166.62
   eth1:
     type: private
     address: 192.168.100.31
     netmask: 255.255.255.0
     gateway: 192.168.100.1
 
 backups::exclude:
   - var/lib/rabbitmq
 
 swh::deploy::search::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::storage::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
 swh::deploy::storage::db::user: guest
 swh::deploy::storage::db::password: guest
 
 # sync_mailmaps needs write access to the main database
 swh::deploy::webapp::sync_mailmaps::db::host: belvedere.internal.softwareheritage.org
 
 swh::deploy::objstorage::backend::listen::host: moma.internal.softwareheritage.org
 swh::deploy::objstorage::vhost::letsencrypt_cert: objstorage_production
 swh::deploy::objstorage::reverse_proxy::backend_http_host: "%{alias('swh::deploy::objstorage::backend::listen::host')}"
 
 swh::deploy::objstorage::backend::public_server_name:
   objstorage.softwarehritage.org
   objstorage.internal.softwareheritage.org
 
 swh::deploy::objstorage::backend::server_names:
   - "%{alias('swh::deploy::objstorage::backend::public_server_name')}"
   - "%{::swh_hostname.internal_fqdn}"
   - "%{::hostname}"
   - 127.0.0.1
   - localhost
   - "::1"
 
 swh::deploy::objstorage::config:
   objstorage:
     cls: multiplexer
     args:
       objstorages:
         - "%{alias('swh::remote_service::objstorage::config::banco::readonly')}"
         - "%{alias('swh::remote_service::objstorage::config::saam::readonly')}"
 
 
 swh::deploy::webapp::timers_enabled: true
 
 
 hitch::frontend: "[*]:443"
 hitch::proxy_support: true
 
 varnish::http_port: 80
 apache::http_port: 9080
 
 # Disabled as it seems to be flaky
 #hitch::http2_support: true
 #varnish::http2_support: true
 
 # Disable default vhost on port 80
 apache::default_vhost: false
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}"
 
 mountpoints:
   /srv/storage/space/swh-deposit:
     device: saam:/srv/storage/space/swh-deposit
     fstype: nfs
     options:
       - rw
       - soft
       - intr
       - rsize=8192
       - wsize=8192
       - noauto
       - x-systemd.automount
       - x-systemd.device-timeout=10
   /tmp:
     ensure: absent
   swap:
     ensure: absent
   /srv/storage/space:
     ensure: absent
 
 
 smtp::virtual_aliases:
   - destination: "@%{lookup('swh::deploy::webapp::inbound_email::domain')}"
     alias: "%{lookup('swh::deploy::webapp::user')}"
 
 smtp::extra_aliases_files:
   - owner: "%{lookup('swh::deploy::webapp::user')}"
     group: "%{lookup('swh::deploy::webapp::group')}"
     base_directory: "/etc/postfix/swhwebapp"
     contents:
       - user: "%{lookup('swh::deploy::webapp::user')}"
         aliases:
-          - "| django-admin process-inbound-email --settings=%{lookup('swh::deploy::webapp::django_settings_module')}"
+          - "| django-admin process_inbound_email --settings=%{lookup('swh::deploy::webapp::django_settings_module')}"
diff --git a/data/hostname/webapp.internal.staging.swh.network.yaml b/data/hostname/webapp.internal.staging.swh.network.yaml
index 06cab105..bdb3c608 100644
--- a/data/hostname/webapp.internal.staging.swh.network.yaml
+++ b/data/hostname/webapp.internal.staging.swh.network.yaml
@@ -1,76 +1,76 @@
 networks:
   eth0:
     address: 192.168.130.30
     netmask: 255.255.255.0
     gateway: 192.168.130.1
 
 swh::deploy::storage::db::user: guest
 swh::deploy::storage::db::password: guest
 swh::deploy::storage::backend::listen::host: "%{::fqdn}"
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}"
 
 swh::deploy::webapp::backend::workers: 16
 swh::deploy::webapp::backend::http_keepalive: 5
 swh::deploy::webapp::backend::http_timeout: 3600
 swh::deploy::webapp::backend::reload_mercy: 3600
 swh::deploy::webapp::config::throttling:
   cache_uri: "%{hiera('memcached::server::bind')}:%{hiera('memcached::server::port')}"
   scopes:
     swh_api:
       limiter_rate:
         default: 120/h
       exempted_networks:
         - 127.0.0.0/8
         - 192.168.100.0/23
         - 129.168.130.0/24
     swh_api_origin_search:
       limiter_rate:
         default: 10/m
     swh_api_origin_visit_latest:
       # This endpoint gets called a lot (by default, up to 70 times
       # per origin search), so it deserves a much higher rate-limit
       # than the rest of the API.
       limiter_rate:
         default: 700/m
       exempted_networks:
         - 127.0.0.0/8
         - 192.168.100.0/23
         - 192.168.130.0/24
     swh_vault_cooking:
       limiter_rate:
         default: 120/h
         GET: 60/m
       exempted_networks:
         - 127.0.0.0/8
         - 192.168.100.0/23
         - 192.168.130.0/24
     swh_save_origin:
       limiter_rate:
         default: 120/h
         POST: 10/h
       exempted_networks:
         - 127.0.0.0/8
         - 192.168.100.0/23
         - 129.168.130.0/24
 swh::deploy::webapp::config::keycloak:
   server_url: "https://%{hiera('keycloak::vhost::name')}/auth/"
   realm_name: SoftwareHeritageStaging
 
 swh::deploy::webapp::instance_name: webapp.staging.swh.network
 
 swh::deploy::webapp::timers_enabled: true
 
 
 smtp::virtual_aliases:
   - destination: "@%{lookup('swh::deploy::webapp::inbound_email::domain')}"
     alias: "%{lookup('swh::deploy::webapp::user')}"
 
 smtp::extra_aliases_files:
   - owner: "%{lookup('swh::deploy::webapp::user')}"
     group: "%{lookup('swh::deploy::webapp::group')}"
     base_directory: "/etc/postfix/swhwebapp"
     contents:
       - user: "%{lookup('swh::deploy::webapp::user')}"
         aliases:
-          - "| django-admin process-inbound-email --settings=%{lookup('swh::deploy::webapp::django_settings_module')}"
+          - "| django-admin process_inbound_email --settings=%{lookup('swh::deploy::webapp::django_settings_module')}"