diff --git a/roles/mysql_server/vars/RedHat-9.yml b/roles/mysql_server/vars/RedHat-9.yml
new file mode 100644
index 0000000..ededb0a
--- /dev/null
+++ b/roles/mysql_server/vars/RedHat-9.yml
@@ -0,0 +1,6 @@
+---
+
+mysql_server_packages:
+  - "{{ (mysql_engine == 'mysql') | ternary('mysql-server','mariadb-server') }}"
+  - "{{ (mysql_engine == 'mysql') | ternary('mysql','mariadb') }}"
+  - python3-mysqlclient
diff --git a/roles/nginx/tasks/install_nginx.yml b/roles/nginx/tasks/install_nginx.yml
index d6cab17..7c4fcd2 100644
--- a/roles/nginx/tasks/install_nginx.yml
+++ b/roles/nginx/tasks/install_nginx.yml
@@ -14,7 +14,7 @@
   changed_when: False
   when:
     - ansible_os_family == 'RedHat'
-    - ansible_distribution_major_version is version('8', '>=')
+    - ansible_distribution_major_version is version('8', '=')
   tags: web
 
 - name: Install nginx
diff --git a/roles/nginx/tasks/install_openresty.yml b/roles/nginx/tasks/install_openresty.yml
index a07026a..055dadc 100644
--- a/roles/nginx/tasks/install_openresty.yml
+++ b/roles/nginx/tasks/install_openresty.yml
@@ -10,6 +10,15 @@
   when: nginx_nginx_service.stat.exists
   tags: web
 
+- name: Remove nginx
+  yum:
+    name:
+      - nginx
+      - nginx-filesystem
+      - nginx-core
+    state: absent
+  tags: web
+
 - name: Create the nginx user account
   user:
     name: nginx
@@ -50,13 +59,6 @@
       dest: /usr/local/openresty/nginx/html
   tags: web
 
-- name: Remove nginx
-  yum:
-    name:
-      - nginx
-    state: absent
-  tags: web
-
 - name: Install packages
   yum:
     name:
diff --git a/roles/postgresql_server/vars/RedHat-9.yml b/roles/postgresql_server/vars/RedHat-9.yml
new file mode 100644
index 0000000..3fde919
--- /dev/null
+++ b/roles/postgresql_server/vars/RedHat-9.yml
@@ -0,0 +1,7 @@
+---
+
+pg_packages:
+  - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}
+  - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-server
+  - postgresql{{ (pg_version != 'default') | ternary(pg_version | string,'') }}-contrib
+  - python3-psycopg2
diff --git a/roles/repo_mariadb/templates/mariadb.repo.j2 b/roles/repo_mariadb/templates/mariadb.repo.j2
index 0221a47..762580d 100644
--- a/roles/repo_mariadb/templates/mariadb.repo.j2
+++ b/roles/repo_mariadb/templates/mariadb.repo.j2
@@ -1,6 +1,6 @@
 {% if mysql_mariadb_version != 'default' %}
 [mariadb]
-baseurl = http://yum.mariadb.org/{{ mysql_mariadb_version }}/centos$releasever-amd64
+baseurl = http://yum.mariadb.org/{{ mysql_mariadb_version }}/rhel$releasever-amd64
 gpgcheck = 1
 gpgkey = https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
 name = MariaDB
diff --git a/roles/repo_openresty/tasks/main.yml b/roles/repo_openresty/tasks/main.yml
index 182e0da..464b48d 100644
--- a/roles/repo_openresty/tasks/main.yml
+++ b/roles/repo_openresty/tasks/main.yml
@@ -6,7 +6,7 @@
     description: Official OpenResty Open Source Repository for CentOS
     baseurl: https://openresty.org/package/centos/$releasever/$basearch
     gpgcheck: True
-    gpgkey: https://openresty.org/package/pubkey.gpg
+    gpgkey: "{{ ansible_distribution_major_version is version('8', '>') | ternary('https://openresty.org/package/pubkey2.gpg', 'https://openresty.org/package/pubkey.gpg') }}"
     exclude:
       - perl-IPC-Run
       - perl-IO-Tty