diff --git a/build/ansible/roles/pmm-images/tasks/main.yml b/build/ansible/roles/pmm-images/tasks/main.yml
index 615e468d68..340f683934 100644
--- a/build/ansible/roles/pmm-images/tasks/main.yml
+++ b/build/ansible/roles/pmm-images/tasks/main.yml
@@ -1,11 +1,8 @@
 ---
-# We use percona-release package to install the gpg keys and ppg-14
-# To workaround the package's incompatibility with RHEL9, we have to disable the gpg verification :(
-- name: Add percona-release package
-  yum:
-    name: https://repo.percona.com/yum/percona-release-latest.noarch.rpm
-    state: installed
-    disable_gpg_check: yes
+- name: Import Percona GPG key
+  rpm_key:
+    state: present
+    key: https://repo.percona.com/yum/PERCONA-PACKAGING-KEY
 
 - name: List installed gpg keys
   command: ls -la /etc/pki/rpm-gpg
@@ -30,6 +27,7 @@
     name:
       - python3-pip
       - rsync
+      - findutils
     state: latest
 
 - name: Create groups
diff --git a/build/ansible/roles/postgres/tasks/main.yml b/build/ansible/roles/postgres/tasks/main.yml
index d308d17a18..3a976fc2c4 100644
--- a/build/ansible/roles/postgres/tasks/main.yml
+++ b/build/ansible/roles/postgres/tasks/main.yml
@@ -18,6 +18,8 @@
       - percona-postgresql14
       - python3-psycopg2 # Python PostgreSQL database adapter
     state: installed
+    nobest: true
+    skip_broken: true    
 
 - name: Create a socket directory for Postgres
   file:
@@ -72,10 +74,17 @@
     db: pmm-managed
     name: pmm-managed
     password: "md5da757ec3e22c6d86a2bb8e70307fa937"
-    priv: "ALL"
+    # priv: "ALL" # deprecated, see a separate task below
     expires: infinity
     state: present
 
+- name: Grant ALL privileges to pmm-managed user
+  postgresql_privs:
+    db: pmm-managed
+    privs: ALL
+    type: database
+    role: pmm-managed
+
 - name: Create pg_stat_statements extension
   postgresql_ext:
     db: postgres