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
@@ -17,7 +17,10 @@
     port: 9200
 ## End of search / staging specific configuration
 
-swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::saam')}"
+swh::deploy::storage::db::host: db.internal.softwareheritage.org
+swh::deploy::storage::backend::workers: 16
+
+swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::localhost')}"
 swh::remote_service::search::config: "%{alias('swh::remote_service::search::config::localhost')}"
 
 swh::deploy::reverse_proxy::services:
diff --git a/manifests/site.pp b/manifests/site.pp
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,7 +21,7 @@
 }
 
 node 'webapp1.internal.softwareheritage.org' {
-  include role::swh_rp_webapp_with_swh_search
+  include role::swh_rp_webapp_with_swh_search_and_storage
 }
 
 node /^search-esnode\d\.internal\.softwareheritage\.org$/ {
diff --git a/site-modules/role/manifests/swh_rp_webapp_with_swh_search.pp b/site-modules/role/manifests/swh_rp_webapp_with_swh_search.pp
deleted file mode 100644
--- a/site-modules/role/manifests/swh_rp_webapp_with_swh_search.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-# Web ui profile with reverse proxy and swh-search backend
-class role::swh_rp_webapp_with_swh_search inherits role::swh_rp_webapp {
-  include profile::swh::deploy::search
-}
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
new file mode 100644
--- /dev/null
+++ b/site-modules/role/manifests/swh_rp_webapp_with_swh_search_and_storage.pp
@@ -0,0 +1,5 @@
+# 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
+}