diff --git a/manifests/site.pp b/manifests/site.pp
index 8ac84605..c34a829c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,116 +1,116 @@
 node 'louvre.internal.softwareheritage.org' {
   include role::swh_server
 }
 
 node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/
 {
   include role::swh_hypervisor
 }
 
 node 'pergamon.softwareheritage.org' {
   include role::swh_sysadmin
   include profile::export_archive_counters
 }
 
 node 'tate.softwareheritage.org' {
   include role::swh_forge
 }
 
 node 'moma.softwareheritage.org' {
   include role::swh_api
 }
 
 node 'webapp0.softwareheritage.org' {
-  include role::swh_api_azure
+  include role::swh_base_api
 }
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler
 }
 
 node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ {
   include role::swh_database
   include profile::pgbouncer
 }
 
 node 'banco.softwareheritage.org' {
   include role::swh_backup
   include role::postgresql_backup
 }
 
 node /^esnode\d+.(internal.)?softwareheritage.org$/ {
   include role::swh_elasticsearch
 }
 
 node /^(unibo-test).(internal.)?softwareheritage.org$/ {
   include role::swh_vault_test
 }
 
 node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ {
   include role::swh_vault
 }
 
 node /^uffizi\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_storage_baremetal
 }
 
 node /^storage\d+\.[^.]+\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_storage
 }
 
 node /^getty.(internal.)?softwareheritage.org$/ {
   include role::swh_eventlog
 }
 
 node /^worker\d+\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_worker_inria
 }
 
 node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_worker_azure
 }
 
 node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_database
 }
 
 node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_osd
 }
 
 node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_mon
 }
 
 node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ {
   include role::swh_nameserver_secondary
 }
 
 node 'thyssen.internal.softwareheritage.org' {
   include role::swh_ci_server
 }
 
 node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ci_agent_debian
 }
 
 node 'logstash0.internal.softwareheritage.org' {
   include role::swh_logstash_instance
 }
 
 node 'kibana0.internal.softwareheritage.org' {
   include role::swh_kibana_instance
 }
 
 node 'munin0.internal.softwareheritage.org' {
   include role::swh_munin_master
 }
 
 node 'giverny.softwareheritage.org' {
   include role::swh_desktop
 }
 
 node default {
   include role::swh_base
   include profile::puppet::agent
 }
diff --git a/site-modules/role/manifests/swh_api.pp b/site-modules/role/manifests/swh_api.pp
index 01bce4ee..ca7638a3 100644
--- a/site-modules/role/manifests/swh_api.pp
+++ b/site-modules/role/manifests/swh_api.pp
@@ -1,13 +1,6 @@
-class role::swh_api inherits role::swh_server {
+class role::swh_api inherits role::swh_base_api {
   include profile::network
-  include profile::puppet::agent
 
-  # Web UI
-  include profile::memcached
-  include profile::swh::deploy::storage
-  include profile::swh::deploy::webapp
+  # Extra deposit and storage services
   include profile::swh::deploy::deposit
-
-  # Apache logs
-  include profile::filebeat
 }
diff --git a/site-modules/role/manifests/swh_api_azure.pp b/site-modules/role/manifests/swh_base_api.pp
similarity index 55%
rename from site-modules/role/manifests/swh_api_azure.pp
rename to site-modules/role/manifests/swh_base_api.pp
index d98cf60d..9c85e1fa 100644
--- a/site-modules/role/manifests/swh_api_azure.pp
+++ b/site-modules/role/manifests/swh_base_api.pp
@@ -1,15 +1,11 @@
-# expansion of role::swh_api
-# -network: incompatible with Azure infrastructure
-# -deposit: not need for it
-
-class role::swh_api_azure inherits role::swh_server {
+class role::swh_base_api inherits role::swh_server {
   include profile::puppet::agent
 
   # Web UI
   include profile::memcached
   include profile::swh::deploy::storage
   include profile::swh::deploy::webapp
 
   # Apache logs
   include profile::filebeat
 }