diff --git a/manifests/swh/deploy/objstorage.pp b/manifests/swh/deploy/objstorage.pp
index ab726c4c..97274aae 100644
--- a/manifests/swh/deploy/objstorage.pp
+++ b/manifests/swh/deploy/objstorage.pp
@@ -1,25 +1,26 @@
 # Deployment of the swh.objstorage.api server
 
 class profile::swh::deploy::objstorage {
   $conf_directory = hiera('swh::deploy::objstorage::conf_directory')
   $group = hiera('swh::deploy::objstorage::group')
   $swh_packages = ['python3-swh.objstorage']
 
   package {$swh_packages:
     ensure  => latest,
     require => Apt::Source['softwareheritage'],
   }
+  Package[$swh_packages] ~> Service['gunicorn-swh-vault']
 
   file {$conf_directory:
     ensure => directory,
     owner  => 'root',
     group  => $group,
     mode   => '0750',
   }
 
-  ::profile::swh::deploy::rpc_instance {'objstorage':
+  ::profile::swh::deploy::rpc_server {'objstorage':
     executable        => 'swh.objstorage.api.server:make_app_from_configfile()',
     worker            => 'async',
     http_check_string => 'SWH Objstorage API server',
   }
 }
diff --git a/manifests/swh/deploy/vault.pp b/manifests/swh/deploy/vault.pp
index 4ed8191a..e55bb893 100644
--- a/manifests/swh/deploy/vault.pp
+++ b/manifests/swh/deploy/vault.pp
@@ -1,12 +1,12 @@
 # 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']
 
-  ::profile::swh::deploy::rpc_instance {'vault':
+  ::profile::swh::deploy::rpc_server {'vault':
     executable        => 'swh.vault.api.server:make_app_from_configfile()',
     worker            => 'async',
     http_check_string => 'SWH Vault API server',
   }
 }