diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml
index ff2dc95c..51b5a931 100644
--- a/tasks/galera_install_yum.yml
+++ b/tasks/galera_install_yum.yml
@@ -117,6 +117,14 @@
   retries: 5
   delay: 2
 
+- name: Enable module_hotfixes
+  lineinfile:
+    dest: "/etc/yum.repos.d/{{ galera_repo.name }}.repo"
+    line: "module_hotfixes=1"
+    regexp: "^module_hotfixes"
+    insertafter: "^enabled"
+  when: ansible_distribution_major_version is version('8', '>=')
+
 # When changing the repo URL, the metadata does
 # not reliably update, resulting in the right
 # URL being used, but the wrong package list.
diff --git a/vars/redhat.yml b/vars/redhat.yml
index ac397f3a..637a239d 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -32,7 +32,7 @@ galera_server_required_distro_packages:
   - libgcrypt
   - MariaDB-client
   - MariaDB-devel
-  - MySQL-python # needed by mysql_user
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('MySQL-python', 'python3-PyMySQL') }}" # needed by mysql_user
   - xinetd
 
 galera_etc_conf_file: "/etc/mysql/my.cnf"
@@ -61,7 +61,7 @@ galera_server_upgrade_packages_remove:
   - MariaDB-Galera-server
   - MariaDB-server
 
-_galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-amd64/"
+_galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/rhel/$releasever/$basearch"
 _galera_repo:
   name: MariaDB
   description: "MariaDB Repo"