diff --git a/postgresql/tasks/main.yml b/postgresql/tasks/main.yml
index 3bc1f904..bf2576f9 100644
--- a/postgresql/tasks/main.yml
+++ b/postgresql/tasks/main.yml
@@ -4,7 +4,10 @@
   when: ansible_distribution_release == "jessie"
 
 - include: packages_stretch.yml
-  when: ansible_distribution_major_version | version_compare('9', '>=')
+  when: ansible_distribution_major_version | version_compare('9', '=')
+
+- include: packages_buster.yml
+  when: ansible_distribution_major_version | version_compare('10', '>=')
 
 - include: config.yml
 
diff --git a/postgresql/tasks/nrpe.yml b/postgresql/tasks/nrpe.yml
index 968f2fcc..8ce178e9 100644
--- a/postgresql/tasks/nrpe.yml
+++ b/postgresql/tasks/nrpe.yml
@@ -26,6 +26,7 @@
     postgresql_user:
       name: nrpe
       password: '{{ postgresql_nrpe_password.stdout }}'
+      encrypted: yes
       no_password_changes: yes
     register: postgresql_create_nrpe_user
     when: nrpe_evolix_config.stat.exists
diff --git a/postgresql/tasks/packages_buster.yml b/postgresql/tasks/packages_buster.yml
new file mode 100644
index 00000000..83672215
--- /dev/null
+++ b/postgresql/tasks/packages_buster.yml
@@ -0,0 +1,8 @@
+---
+
+- name: Install postgresql package
+  apt:
+    name: '{{item}}'
+  with_items:
+  - postgresql
+  - libdbd-pg-perl