diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -3620,4 +3620,7 @@
 
 swh::provenance::db::shared_buffers: 32GB
 
+swh::postgresql::version: "11"
 swh::postgresql::max_connections: 100
+
+postgresql::globals::version: "%{lookup('swh::postgresql::version')}"
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
@@ -184,8 +184,6 @@
   shared_buffers: "%{alias('swh::postgresql::shared_buffers')}"
   cluster_name: "%{alias('swh::postgresql::cluster_name')}"
 
-postgresql::globals::version: "%{alias('swh::postgresql::version')}"
-
 swh::dbs:
   storage:
     name: swh
diff --git a/data/hostname/bardo.internal.admin.swh.network.yaml b/data/hostname/bardo.internal.admin.swh.network.yaml
--- a/data/hostname/bardo.internal.admin.swh.network.yaml
+++ b/data/hostname/bardo.internal.admin.swh.network.yaml
@@ -14,8 +14,6 @@
   - 192.168.100.0/24 # Monitoring
   - 192.168.130.0/24 # Staging services
 
-postgresql::globals::version: "%{alias('swh::postgresql::version')}"
-
 postgresql::server::config_entries:
   shared_buffers: "%{alias('swh::postgresql::shared_buffers')}"
   cluster_name: "%{alias('swh::postgresql::cluster_name')}"
diff --git a/data/hostname/bojimans.internal.softwareheritage.org.yaml b/data/hostname/bojimans.internal.softwareheritage.org.yaml
--- a/data/hostname/bojimans.internal.softwareheritage.org.yaml
+++ b/data/hostname/bojimans.internal.softwareheritage.org.yaml
@@ -4,6 +4,3 @@
     address: 192.168.100.199
     netmask: 24
     gateway: 192.168.100.1
-
-swh::postgresql::version: "11"
-postgresql::globals::version: "%{alias('swh::postgresql::version')}"
diff --git a/data/hostname/met.internal.softwareheritage.org.yaml b/data/hostname/met.internal.softwareheritage.org.yaml
--- a/data/hostname/met.internal.softwareheritage.org.yaml
+++ b/data/hostname/met.internal.softwareheritage.org.yaml
@@ -53,8 +53,6 @@
     tags: []
 
 swh::postgresql::version: 13
-# hack to don't hang in bullseye
-postgresql::globals::version: "%{lookup('swh::postgresql::version')}"
 
 swh::postgresql::listen_addresses:
   - 0.0.0.0