diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2247,6 +2247,10 @@
   give:
     public_key: "%{hiera('webapp_give_public_key')}"
     token: "%{hiera('webapp_give_token')}"
+  features: "%{alias('swh::deploy::webapp::config::features')}"
+
+swh::deploy::webapp::config::features:
+  add_forge_now: false
 
 swh::deploy::webapp::locked_endpoints:
   - /api/1/content/[^/]+/symbol/
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
@@ -31,6 +31,9 @@
 # swh::deploy::webapp::db::password in private data
 swh::deploy::webapp::inbound_email::domain: "%{lookup('swh::deploy::webapp::inbound_email::staging::domain')}"
 
+swh::deploy::webapp::config::features:
+  add_forge_now: true
+
 swh::deploy::worker::instances:
   - indexer_content_mimetype
   - indexer_fossology_license