diff --git a/README.md b/README.md
index 62f3324262..e3a10f8799 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The role also optimizes the database server settings to improve performance.
 
 ## Requirements
 
-The role currently works with the PostgreSQL server 10, 12, 13, 15 and 16.
+The role currently works with the PostgreSQL server 10, 12, 13, 15, 16 and 18.
 
 ### Collection requirements
 
@@ -23,7 +23,7 @@ ansible-galaxy collection install -vv -r meta/collection-requirements.yml
 
 ### postgresql_version
 
-You can set the version of the PostgreSQL server to 10, 12, 13, 15 or 16.
+You can set the version of the PostgreSQL server to 10, 12, 13, 15, 16 or 18.
 
 ```yaml
 postgresql_version: "13"
diff --git a/tasks/main.yml b/tasks/main.yml
index 072801ffbe..8dcfdabaa2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,7 +18,7 @@
 
 - name: Check if requested version is supported in system (RHEL9)
   fail:
-    msg: RHEL 9 supports only Postgresql 13, 15 and 16
+    msg: RHEL 9 supports only Postgresql 13, 15, 16 and 18
   when:
     - ansible_facts["os_family"] == "RedHat"
     - ansible_facts["distribution_major_version"] == "9"
diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml
index 21580a3811..0f8e7b5f9d 100644
--- a/vars/RedHat_10.yml
+++ b/vars/RedHat_10.yml
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 ---
 __postgresql_packages: >-
-  {{ ['@postgresql:' + postgresql_version +
-       '/server'] if postgresql_version != '16' else
-       ['postgresql-server'] }}
+  {{ ['postgresql' + postgresql_version +
+       '-server'] }}
diff --git a/vars/main.yml b/vars/main.yml
index c59c09a0ef..1878cabbec 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -7,8 +7,8 @@
 # Examples of non-distribution specific (generic) internal variables:
 __postgresql_packages: [postgresql-server]
 __postgresql_versions_el8: ["10", "12", "13", "15", "16"]
-__postgresql_versions_el9: ["13", "15", "16"]
-__postgresql_versions_el10: ["16"]
+__postgresql_versions_el9: ["13", "15", "16", "18"]
+__postgresql_versions_el10: ["16", "18"]
 
 __postgresql_data_dir: /var/lib/pgsql/data