diff --git a/ansible/deploy-pipeline.yml b/ansible/deploy-pipeline.yml
index 63a6d0bb..85d02e45 100644
--- a/ansible/deploy-pipeline.yml
+++ b/ansible/deploy-pipeline.yml
@@ -1,44 +1,10 @@
 ---
 - import_playbook: ansible-version.yml
 
-- hosts: [datacollector.infra.ooni.io, hkgmetadb.infra.ooni.io, amsmetadb.ooni.nu]
+- hosts: datacollector.infra.ooni.io
   roles:
     - docker_py
 
-- hosts: hkgmetadb.infra.ooni.io
-  gather_facts: false # already gathered
-  roles:
-    - role: ooca-cert
-      ooca_ssl_dir: /srv/pl-psql_ssl/pusher
-      ooca_ssl_subj: '/O=OONI/OU=Prometheus Pusher/CN=plpsql@{{ inventory_hostname }}'
-      ooca_group: plpsql
-      ooca_ca: pusher_ca
-      tags: [ on-rename, plpsql ]
-
-- hosts: [hkgmetadb.infra.ooni.io, amsmetadb.ooni.nu]
-  gather_facts: false # already gathered
-  vars:
-    ansible_python_interpreter: "/root/venv/bin/python2.7"
-  roles:
-    - role: plpsql
-      tags: plpsql
-
-- hosts: hkgmetadb.infra.ooni.io
-  gather_facts: false
-  tasks:
-  - name: ensure replication user exists
-    postgresql_user:
-      login_host: localhost
-      login_user: shovel
-      login_password: '{{ shovel_postgres_password }}'
-      db: metadb # otherwise connection fail
-      name: amsrepl
-      password: '{{ amsrepl_hkgmetadb_password }}'
-      encrypted: true
-      role_attr_flags: 'REPLICATION,LOGIN'
-      state: present
-    tags: plpsql
-
 - hosts: datacollector.infra.ooni.io
   gather_facts: false # already gathered
   vars:
diff --git a/ansible/host_vars/ams-api.ooni.nu/vars.yml b/ansible/host_vars/ams-api.ooni.nu/vars.yml
index 3e797252..ce2fdc4d 100644
--- a/ansible/host_vars/ams-api.ooni.nu/vars.yml
+++ b/ansible/host_vars/ams-api.ooni.nu/vars.yml
@@ -1,4 +1,4 @@
 ---
-oomsm_db_url: 'postgresql://amsapi:{{ metadb_amsapi_password }}@amsmetadb.ooni.nu/metadb'
+oomsm_db_url: 'postgresql://amsapi:{{ metadb_amsapi_password }}@ams-pg.ooni.nu/metadb'
 blocklist_ips: '{{ vault_blocklist_ips }}'
 ...
diff --git a/ansible/roles/airflow/files/docker-trampoline b/ansible/roles/airflow/files/docker-trampoline
index 45f6a197..8cfa90ae 100755
--- a/ansible/roles/airflow/files/docker-trampoline
+++ b/ansible/roles/airflow/files/docker-trampoline
@@ -81,7 +81,7 @@ case "$script" in
     volargs="${volargs} --volume=$public/autoclaved/${bucket}:$public/autoclaved/${bucket}:ro"
     set -- /usr/local/bin/centrifugation.py --start "$isofrom" --end "$isotill" \
         --autoclaved-root /data/ooni/public/autoclaved \
-        --postgres "host=hkgmetadb.infra.ooni.io user=shovel dbname=metadb"
+        --postgres "host=ams-pg.ooni.nu user=shovel dbname=metadb"
     ;;
 
     # WAL is flushed after `meta_pg` to ensure that hot replica is not affected
@@ -97,7 +97,7 @@ case "$script" in
     # It may be postgres:9.6 as well, openobservatory/... is used only for consistency.
     exec docker run $docksafe --env-file=/etc/af-worker/hkgmetadb.env \
         openobservatory/sysadmin-postgres-metadb:20190412-010f6f70 \
-        psql --host=hkgmetadb.infra.ooni.io --username=shovel --dbname=metadb \
+        psql --host=ams-pg.ooni.nu --username=shovel --dbname=metadb \
         -c 'CHECKPOINT; SELECT pg_switch_xlog()'
     exit 1 # if exec fails
     ;;