diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -302,10 +302,6 @@
   - host: search-esnode0.internal.staging.swh.network
     port: 9200
 
-swh::remote_service::search::config:
-  cls: remote
-  url: "http://search0.internal.staging.swh.network:%{hiera('swh::remote_service::search::port')}/"
-
 # The webapp can query elasticsearch to get some info related to scheduler
 # tasks associated to save code now request. Modifying this so the staging
 # webapp does not access the production indexes
diff --git a/data/hostname/webapp.internal.staging.swh.network.yaml b/data/hostname/webapp.internal.staging.swh.network.yaml
--- a/data/hostname/webapp.internal.staging.swh.network.yaml
+++ b/data/hostname/webapp.internal.staging.swh.network.yaml
@@ -4,6 +4,12 @@
     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
diff --git a/data/hostname/webapp1.internal.softwareheritage.org.yaml b/data/hostname/webapp1.internal.softwareheritage.org.yaml
--- a/data/hostname/webapp1.internal.softwareheritage.org.yaml
+++ b/data/hostname/webapp1.internal.softwareheritage.org.yaml
@@ -12,6 +12,8 @@
 swh::deploy::storage::db::host: somerset.internal.softwareheritage.org
 swh::deploy::storage::backend::workers: 16
 swh::deploy::storage::backend::listen::host: "%{::fqdn}"
+swh::deploy::storage::db::user: guest
+swh::deploy::storage::db::password: guest
 
 swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::local_internal_network')}"
 
diff --git a/manifests/site.pp b/manifests/site.pp
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@
 }
 
 node 'webapp1.internal.softwareheritage.org' {
-  include role::swh_rp_webapp_with_swh_search_and_storage
+  include role::swh_rp_webapp
 }
 
 node /^search-esnode\d\.internal\.softwareheritage\.org$/ {
diff --git a/site-modules/role/manifests/swh_rp_webapp_with_swh_search_and_storage.pp b/site-modules/role/manifests/swh_rp_webapp_with_swh_search_and_storage.pp
deleted file mode 100644
--- a/site-modules/role/manifests/swh_rp_webapp_with_swh_search_and_storage.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# Web ui profile with reverse proxy, swh-search and swh-storage backend
-class role::swh_rp_webapp_with_swh_search_and_storage inherits role::swh_rp_webapp {
-  include profile::swh::deploy::search
-  include profile::swh::deploy::storage
-}
diff --git a/site-modules/role/manifests/swh_rp_webapps.pp b/site-modules/role/manifests/swh_rp_webapps.pp
--- a/site-modules/role/manifests/swh_rp_webapps.pp
+++ b/site-modules/role/manifests/swh_rp_webapps.pp
@@ -1,6 +1,8 @@
+# Declare:
+# through swh_rp_webapp
+# - webapp + associated packages (r/o storage, search)
+# - apache reverse proxy
+# - deposit
 class role::swh_rp_webapps inherits role::swh_rp_webapp {
-  # Extra deposit and storage services
   include profile::swh::deploy::deposit
-  include profile::swh::deploy::storage
-  include profile::swh::deploy::search
 }
diff --git a/site-modules/role/manifests/swh_webapp.pp b/site-modules/role/manifests/swh_webapp.pp
--- a/site-modules/role/manifests/swh_webapp.pp
+++ b/site-modules/role/manifests/swh_webapp.pp
@@ -1,6 +1,10 @@
-# Webapp api without reverse proxy
+# - Webapp api without reverse proxy
+# - storage
+# - search
 class role::swh_webapp inherits role::swh_server {
   include profile::memcached
+  include profile::swh::deploy::storage
+  include profile::swh::deploy::search
   include profile::swh::deploy::webapp
   include profile::filebeat
 }