diff --git a/site-modules/profile/manifests/swh/deploy/indexer_storage.pp b/site-modules/profile/manifests/swh/deploy/indexer_storage.pp
index c718ec9b..7d0b3d09 100644
--- a/site-modules/profile/manifests/swh/deploy/indexer_storage.pp
+++ b/site-modules/profile/manifests/swh/deploy/indexer_storage.pp
@@ -1,14 +1,14 @@
 # Deployment of the swh.indexer.storage.api.server
 
 class profile::swh::deploy::indexer_storage {
   include ::profile::swh::deploy::base_storage
 
   package {'python3-swh.indexer.storage':
     ensure => 'present',
   } ~> ::profile::swh::deploy::rpc_server {'indexer-storage':
     config_key        => 'indexer::storage',
-    executable        => 'swh.indexer.storage.api.wsgi',
+    executable        => 'swh.indexer.storage.api.server:make_app_from_configfile()',
     worker            => 'sync',
     http_check_string => 'SWH Indexer Storage API server',
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/objstorage.pp b/site-modules/profile/manifests/swh/deploy/objstorage.pp
index faa8885b..ce77230b 100644
--- a/site-modules/profile/manifests/swh/deploy/objstorage.pp
+++ b/site-modules/profile/manifests/swh/deploy/objstorage.pp
@@ -1,39 +1,39 @@
 # Deployment of the swh.objstorage.api server
 
 class profile::swh::deploy::objstorage {
   $conf_directory = lookup('swh::deploy::objstorage::conf_directory')
   $user = lookup('swh::deploy::objstorage::user')
   $group = lookup('swh::deploy::objstorage::group')
   $swh_packages = ['python3-swh.objstorage']
 
   package {$swh_packages:
     ensure  => present,
     require => Apt::Source['softwareheritage'],
   }
   Package[$swh_packages] ~> Service['gunicorn-swh-objstorage']
 
   file {$conf_directory:
     ensure => directory,
     owner  => 'root',
     group  => $group,
     mode   => '0750',
   }
 
   ::profile::swh::deploy::rpc_server {'objstorage':
-    executable => 'swh.objstorage.api.wsgi',
+    executable => 'swh.objstorage.api.server:make_app_from_configfile()',
     worker     => 'async',
   }
 
   # special configuration for pathslicing
   $objstorage_cfg = lookup('swh::deploy::objstorage::config', Hash)['objstorage']
 
   if $objstorage_cfg['cls'] == 'pathslicing' {
     $obj_directory = $objstorage_cfg['args']['root']
     file {$obj_directory:
       ensure => directory,
       owner  => $user,
       group  => $group,
       mode   => '0750',
     }
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/storage.pp b/site-modules/profile/manifests/swh/deploy/storage.pp
index c2d4504c..69827fdb 100644
--- a/site-modules/profile/manifests/swh/deploy/storage.pp
+++ b/site-modules/profile/manifests/swh/deploy/storage.pp
@@ -1,21 +1,21 @@
 # Deployment of the swh.storage.api server
 
 class profile::swh::deploy::storage {
   include ::profile::swh::deploy::base_storage
 
   package {'python3-swh.storage':
     ensure => 'present',
   } ~> ::profile::swh::deploy::rpc_server {'storage':
-    executable        => 'swh.storage.api.wsgi',
+    executable        => 'swh.storage.api.server:make_app_from_configfile()',
     worker            => 'sync',
     http_check_string => '<title>Software Heritage storage server</title>',
   }
 
   $storage_config = lookup('swh::deploy::storage::config')['storage']
 
   if ($storage_config['cls'] == 'local'
       and $storage_config['args']['journal_writer']
       and $storage_config['args']['journal_writer']['cls'] == 'kafka') {
     include ::profile::swh::deploy::journal
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/vault.pp b/site-modules/profile/manifests/swh/deploy/vault.pp
index d776182f..1deb2526 100644
--- a/site-modules/profile/manifests/swh/deploy/vault.pp
+++ b/site-modules/profile/manifests/swh/deploy/vault.pp
@@ -1,20 +1,20 @@
 # Deployment of the swh.vault.api server
 
 class profile::swh::deploy::vault {
   include ::profile::swh::deploy::base_vault
   Package['python3-swh.vault'] ~> Service['gunicorn-swh-vault']
 
   $user = lookup('swh::deploy::vault::user')
   $cache_directory = lookup('swh::deploy::vault::cache')
   file {$cache_directory:
     ensure => directory,
     owner  => $user,
     group  => 'swhdev',
     mode   => '0755',
   }
 
   ::profile::swh::deploy::rpc_server {'vault':
-    executable => 'swh.vault.api.wsgi:app',
+    executable => 'swh.vault.api.server:make_app_from_configfile()',
     worker     => 'async',
   }
 }