diff --git a/defaults/main.yml b/defaults/main.yml
index 4d581d0..71fbd7f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,3 +5,9 @@ postgresql:
   allowed_hosts: {}
   dbs: {}
   users: {}
+
+distro_pg_version_mapping:
+  stretch: "9.6"
+  buster: "11"
+  bullseye: "13"
+  bookworm: "15"
diff --git a/vars/main.yml b/vars/main.yml
index 3abf2df..ee5a279 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1 +1 @@
-pg_version: "{% if ansible_distribution_release  == 'stretch' %}9.6{% endif %}{% if ansible_distribution_release  == 'buster' %}11{% endif %}{%if ansible_distribution_release == 'bullseye' %}13{% endif %}"
+pg_version: "{{ distro_pg_version_mapping[ansible_distribution_release] }}"