diff --git a/manifests/swh/deploy/objstorage.pp b/manifests/swh/deploy/objstorage.pp
index f145802c..ab726c4c 100644
--- a/manifests/swh/deploy/objstorage.pp
+++ b/manifests/swh/deploy/objstorage.pp
@@ -1,93 +1,25 @@
 # Deployment of the swh.objstorage.api server
 
 class profile::swh::deploy::objstorage {
   $conf_directory = hiera('swh::deploy::objstorage::conf_directory')
-  $conf_file = hiera('swh::deploy::objstorage::conf_file')
-  $user = hiera('swh::deploy::objstorage::user')
   $group = hiera('swh::deploy::objstorage::group')
-
-  $objstorage_config = hiera('swh::deploy::objstorage::config')
-
   $swh_packages = ['python3-swh.objstorage']
 
-  $backend_listen_host = hiera('swh::deploy::objstorage::backend::listen::host')
-  $backend_listen_port = hiera('swh::deploy::objstorage::backend::listen::port')
-  $backend_listen_address = "${backend_listen_host}:${backend_listen_port}"
-
-  $backend_workers = hiera('swh::deploy::objstorage::backend::workers')
-  $backend_http_keepalive = hiera('swh::deploy::objstorage::backend::http_keepalive')
-  $backend_http_timeout = hiera('swh::deploy::objstorage::backend::http_timeout')
-  $backend_reload_mercy = hiera('swh::deploy::objstorage::backend::reload_mercy')
-
-  include ::gunicorn
-
   package {$swh_packages:
     ensure  => latest,
     require => Apt::Source['softwareheritage'],
   }
 
   file {$conf_directory:
     ensure => directory,
     owner  => 'root',
     group  => $group,
     mode   => '0750',
   }
 
-  file {$conf_file:
-    ensure  => present,
-    owner   => 'root',
-    group   => $group,
-    mode    => '0640',
-    content => inline_template("<%= @objstorage_config.to_yaml %>\n"),
-    notify  => Service['gunicorn-swh-objstorage'],
-  }
-
-  ::gunicorn::instance {'swh-objstorage':
-    ensure     => enabled,
-    user       => $user,
-    group      => $group,
-    executable => 'swh.objstorage.api.server:make_app_from_configfile()',
-    settings   => {
-      bind             => $backend_listen_address,
-      workers          => $backend_workers,
-      worker_class     => 'aiohttp.worker.GunicornWebWorker',
-      timeout          => $backend_http_timeout,
-      graceful_timeout => $backend_reload_mercy,
-      keepalive        => $backend_http_keepalive,
-    }
-  }
-
-  $icinga_checks_file = '/etc/icinga2/conf.d/exported-checks.conf'
-
-  @@::icinga2::object::service {"swh-objstorage api (localhost on ${::fqdn})":
-    service_name     => 'swh-objstorage api (localhost)',
-    import           => ['generic-service'],
-    host_name        => $::fqdn,
-    check_command    => 'http',
-    command_endpoint => $::fqdn,
-    vars             => {
-      http_address => '127.0.0.1',
-      http_port    => $backend_listen_port,
-      http_uri     => '/',
-      http_string  => 'SWH Objstorage API server',
-    },
-    target           => $icinga_checks_file,
-    tag              => 'icinga2::exported',
-  }
-
-  if $backend_listen_host != '127.0.0.1' {
-    @@::icinga2::object::service {"swh-objstorage api (remote on ${::fqdn})":
-      service_name  => 'swh-objstorage api (remote)',
-      import        => ['generic-service'],
-      host_name     => $::fqdn,
-      check_command => 'http',
-      vars          => {
-        http_port   => $backend_listen_port,
-        http_uri    => '/',
-        http_string => 'SWH Objstorage API server',
-      },
-      target        => $icinga_checks_file,
-      tag           => 'icinga2::exported',
-    }
+  ::profile::swh::deploy::rpc_instance {'objstorage':
+    executable        => 'swh.objstorage.api.server:make_app_from_configfile()',
+    worker            => 'async',
+    http_check_string => 'SWH Objstorage API server',
   }
 }