diff --git a/roles/common/files/mnv_cli b/roles/common/files/mnv_cli
new file mode 100644
index 0000000..99cd6c9
Binary files /dev/null and b/roles/common/files/mnv_cli differ
diff --git a/roles/common/tasks/hardware.yml b/roles/common/tasks/hardware.yml
index c1474f8..9ea08b3 100644
--- a/roles/common/tasks/hardware.yml
+++ b/roles/common/tasks/hardware.yml
@@ -7,6 +7,9 @@
 - set_fact:
     lsi_controllers: "{{ controllers | select('match', '(?i).*(lsi|megaraid).*') | list | unique }}"
 
+- set_fact:
+    marvell_nvme_controllers: "{{ controllers | select('match', '(?i).*Marvell.*Non-Volatile memory controller.*') | list | unique }}"
+
 - include_tasks: hardware_{{ ansible_os_family }}.yml
 
 - name: Remove MegaCli package
@@ -15,4 +18,6 @@
     - lsi_controllers | length > 0
     - megacli_installed_version.stdout != megacli_version
 
-...
+- name: Copy nmv_cli
+  copy: src=mnv_cli dest=/usr/local/bin/mnv_cli owner=root group=root mode=755
+  when: marvell_nvme_controllers | length > 0
diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml
index 48bf1a1..51dba3c 100644
--- a/roles/consul_bin/defaults/main.yml
+++ b/roles/consul_bin/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 
 # Version of consul to deploy
-consul_version: 1.19.1
+consul_version: 1.19.2
 # URL from where the consul archive will be downloaded
 consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip
 # Expected sha256 of the archive
-consul_archive_sha256: aa48085aaa6f4130d0f1ee98c416dcd51b1b0f980d34f5b91834fd5b3387891c
+consul_archive_sha256: 9315d95b19cf851f8fb0013b583ede6f61d591a9024a7dbb9b37eee45270abd2
diff --git a/roles/jitsi_jibri/templates/jibri.conf.j2 b/roles/jitsi_jibri/templates/jibri.conf.j2
index 0ae90bb..3de1713 100644
--- a/roles/jitsi_jibri/templates/jibri.conf.j2
+++ b/roles/jitsi_jibri/templates/jibri.conf.j2
@@ -64,7 +64,8 @@ jibri {
       "--kiosk",
       "--enabled",
       "--disable-infobars",
-      "--autoplay-policy=no-user-gesture-required"
+      "--autoplay-policy=no-user-gesture-required",
+      "--search-engine-choice-country"
     ]
   }
   stats {
diff --git a/roles/repo_base/tasks/CentOS-7.yml b/roles/repo_base/tasks/CentOS-7.yml
index f820b0d..90ba629 100644
--- a/roles/repo_base/tasks/CentOS-7.yml
+++ b/roles/repo_base/tasks/CentOS-7.yml
@@ -5,7 +5,7 @@
     file: CentOS-Base
     description: "Centos - {{ item.repo }}"
     name: "{{ item.repo }}"
-    baseurl: https://vault.centos.org/7.9.2009/{{{ item.dir }}/$basearch/
+    baseurl: https://vault.centos.org/7.9.2009/{{ item.dir }}/$basearch/
     gpgcheck: True
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
     exclude: 'lasso*'
diff --git a/roles/repo_base/tasks/epel_RedHat-7.yml b/roles/repo_base/tasks/epel_RedHat-7.yml
index 296e7d2..736c39c 100644
--- a/roles/repo_base/tasks/epel_RedHat-7.yml
+++ b/roles/repo_base/tasks/epel_RedHat-7.yml
@@ -4,8 +4,8 @@
   yum_repository:
     name: epel
     description: "Extra Package for Enterprise Linux"
-    baseurl: http://mirrors.ircam.fr/pub/fedora/epel/$releasever/$basearch http://mir01.syntis.net/epel/$releasever/$basearch
+    baseurl: https://dl.fedoraproject.org/pub/archive/epel/$releasever/$basearch
     gpgcheck: True
-    gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-7
+    gpgkey: https://dl.fedoraproject.org/pub/archive/epel/RPM-GPG-KEY-EPEL
     exclude: dehydrated
   tags: repo
diff --git a/roles/rsync_server/vars/RedHat-9.yml b/roles/rsync_server/vars/RedHat-9.yml
new file mode 100644
index 0000000..a397531
--- /dev/null
+++ b/roles/rsync_server/vars/RedHat-9.yml
@@ -0,0 +1,6 @@
+---
+
+rsync_packages:
+  - rsync
+  - rsync-daemon
+  - python3-libsemanage
diff --git a/roles/samba/tasks/facts.yml b/roles/samba/tasks/facts.yml
index 106996f..f0cee40 100644
--- a/roles/samba/tasks/facts.yml
+++ b/roles/samba/tasks/facts.yml
@@ -36,7 +36,7 @@
 - name: Add rsyncd port to the list of ports
   set_fact: samba_dc_tcp_ports={{ samba_dc_tcp_ports + ['873'] }}
   when: samba_i_am_primary_dc == True
-  tags: samba
+  tags: samba,firewall
 
 # sssd-ad can now be installed on EL8 with samba4 build from Tranquil IT
 # so don't turn ad_auth off anymore
diff --git a/roles/samba/vars/RedHat-9.yml b/roles/samba/vars/RedHat-9.yml
new file mode 100644
index 0000000..92cf529
--- /dev/null
+++ b/roles/samba/vars/RedHat-9.yml
@@ -0,0 +1,20 @@
+---
+
+samba_common_packages:
+  - samba
+  - samba-client
+  - sssd-winbind-idmap
+  - openldap-clients
+  - policycoreutils-python-utils
+  - tdb-tools
+
+samba_dc_packages:
+  - samba-dc
+  - ldb-tools
+  - krb5-workstation
+  - python3-markdown
+  - patch
+
+samba_member_packages:
+  - samba-winbind
+  - samba-winbind-clients
diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml
index 3442560..6891b59 100644
--- a/roles/unifi/defaults/main.yml
+++ b/roles/unifi/defaults/main.yml
@@ -3,11 +3,11 @@
 # Where unifi will be installed
 unifi_root_dir: /opt/unifi
 # Version to deploy
-unifi_version: 8.3.32
+unifi_version: 8.4.59
 # URL to get the installation tarball
 unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip
 # Expected sha256
-unifi_archive_sha256: 41a7f37a184af4564719ff81bda147c12719028ae26e57b2c91ae89b7de6feaf
+unifi_archive_sha256: 17a254f81b9c95078ce71e76631925596d3e500313fc9037e940035fdc20cae3
 # Should ansible handle upgrades (if False, only initial install will be done)
 unifi_manage_upgrade: True
 # List of ports used by UniFi controler