diff --git a/data/common/common.yaml b/data/common/common.yaml
index 6f601c3599199525e73eef4402d3f1cc1226e175..bf83cee751e1f51deb65e9b11f1fd903e8bf9480 100644
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1275,6 +1275,10 @@ bind::resource_records:
     type: CNAME
     record: scheduler.internal.staging.swh.network
     data: k8s-archive-staging-rke2.internal.staging.swh.network.
+  webapp-postgresql-staging/CNAME:
+    type: CNAME
+    record: webapp-postgresql.internal.staging.swh.network
+    data: k8s-archive-staging-rke2.internal.staging.swh.network.
   webapp-next-version-staging/CNAME:
     type: CNAME
     record: webapp-cassandra-next-version.internal.staging.swh.network
@@ -1339,6 +1343,7 @@ bind::resource_records:
   staging-rp0/A:
     record: rp0.internal.staging.swh.network
     data: 192.168.130.20
+  # TODO: To drop when decommissioning webapp.internal.s.s.n
   staging-webapp/A:
     record: webapp.internal.staging.swh.network
     data: 192.168.130.30
@@ -4451,10 +4456,12 @@ keycloak::resources::realms:
           redirect_uris:
             # Should match letsencrypt::certificates.archive_staging.domains
             - https://webapp.staging.swh.network/*
+            # TODO: To drop when decommissioning webapp.internal.s.s.n
             - https://webapp.internal.staging.swh.network/*
           roles: "%{alias('keycloak::resources::clients::swh_web::roles')}"
           web_origins:
             - https://webapp.staging.swh.network
+            # TODO: To drop when decommissioning webapp.internal.s.s.n
             - https://webapp.internal.staging.swh.network
         protocol_mappers:
           - "%{alias('keycloak::resources::protocol_mappers::audience')}"
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
index 094dfd1b9653c188e45396eac45b93961d315f12..07a9a32aab26b8fbbcc9a28043b80bd6b681fca3 100644
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -93,6 +93,7 @@ swh::deploy::deposit::vhost::letsencrypt_cert: deposit_staging
 swh::deploy::deposit::reverse_proxy::backend_http_host: deposit.internal.staging.swh.network
 
 swh::deploy::webapp::vhost::letsencrypt_cert: archive_staging
+# TODO: Adapt to webapp-postgresql once deployed in staging
 swh::deploy::webapp::reverse_proxy::backend_http_host: webapp.internal.staging.swh.network
 
 # TODO: Declare a redirect from graphql.staging.swh.network