diff --git a/inventory/group_vars/phpservers.yml b/inventory/group_vars/phpservers.yml
index acd8808..ffd483a 100644
--- a/inventory/group_vars/phpservers.yml
+++ b/inventory/group_vars/phpservers.yml
@@ -2,8 +2,9 @@
 
 php_versions:
   Debian:
-    "10": 7.3
-    "11": 7.4
-    "12": 8.2
+    "buster": 7.3
+    "bullseye": 7.4
+    "bookworm": 8.2
+    "trixie": 8.4
 
-php_version: "{{ php_versions[ansible_os_family][ansible_distribution_major_version] }}"
+php_version: "{{ php_versions[ansible_os_family][ansible_distribution_release] }}"
diff --git a/roles/postgres/vars/main.yml b/roles/postgres/vars/main.yml
index 3f456e4..54c433e 100644
--- a/roles/postgres/vars/main.yml
+++ b/roles/postgres/vars/main.yml
@@ -2,9 +2,9 @@
 
 postgres_pg_versions:
   Debian:
-    "9": 9.6
-    "10": 11
-    "11": 13
-    "12": 15
+    "buster": 11
+    "bullseye": 13
+    "bookworm": 15
+    "trixie": 17
 
-postgres_pg_version: "{{ postgres_pg_versions[ansible_os_family][ansible_distribution_major_version] }}"
+postgres_pg_version: "{{ postgres_pg_versions[ansible_os_family][ansible_distribution_release] }}"