diff --git a/.github/workflows/add-issue-to-project.yml b/.github/workflows/add-issue-to-project.yml
index 1f45549c..0d6da9d9 100644
--- a/.github/workflows/add-issue-to-project.yml
+++ b/.github/workflows/add-issue-to-project.yml
@@ -11,7 +11,7 @@ jobs:
   add-issue-to-project:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/add-to-project@561536e2ee67e89d148c1c9830c9debcf3a7ff07 # v0.69.0
+      - uses: UCL-MIRSG/.github/actions/add-to-project@270d5d2c3a93f1e30394f9dfdd1f53298de8e2cd # v0.85.0
         with:
           app-id: ${{ secrets.APP_ID }}
           app-pem: ${{ secrets.APP_PEM }}
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 549fec7a..7aae6581 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Run `molecule test`
-        uses: UCL-MIRSG/.github/actions/molecule-test@561536e2ee67e89d148c1c9830c9debcf3a7ff07 # v0.69.0
+        uses: UCL-MIRSG/.github/actions/molecule-test@270d5d2c3a93f1e30394f9dfdd1f53298de8e2cd # v0.85.0
         with:
           scenario: ${{ matrix.scenario }}
           # yamllint disable-line rule:line-length
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1df0cdd2..fef9fd23 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 ---
 repos:
   - repo: https://github.com/UCL-MIRSG/.github
-    rev: v0.69.0
+    rev: v0.85.0
     hooks:
       - id: mirsg-hooks
diff --git a/playbooks/molecule/resources/shared/prepare.yml b/playbooks/molecule/resources/shared/prepare.yml
index 19ea19b8..7c670634 100644
--- a/playbooks/molecule/resources/shared/prepare.yml
+++ b/playbooks/molecule/resources/shared/prepare.yml
@@ -14,7 +14,7 @@
   gather_facts: true
   tasks:
     - name: Install crontabs
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: cronie
         state: present
     - name: Start crontabs service
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index e0a07958..6be6f5ff 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure docker dependencies are installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ item }}"
     state: installed
   loop:
@@ -9,7 +9,7 @@
     - lvm2
 
 - name: Install "epel-release" for centos:7
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: installed
   when:
@@ -31,7 +31,7 @@
       - "{{ docker_rpm_gpg_key_url }}"
 
 - name: Ensure docker is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ item }}"
     state: installed
     allow_downgrade: true
diff --git a/roles/install_python/tasks/RedHat.yml b/roles/install_python/tasks/RedHat.yml
index 47594fc5..28351fd5 100644
--- a/roles/install_python/tasks/RedHat.yml
+++ b/roles/install_python/tasks/RedHat.yml
@@ -1,6 +1,6 @@
 ---
 # OS specific tasks for the RedHat family
 - name: Install EPEL for RedHat OSes
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: installed
diff --git a/roles/monitoring_server/tasks/install_nginx_container.yml b/roles/monitoring_server/tasks/install_nginx_container.yml
index 4054325e..cfeb2919 100644
--- a/roles/monitoring_server/tasks/install_nginx_container.yml
+++ b/roles/monitoring_server/tasks/install_nginx_container.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure passlib is installed on centos7
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: python-passlib
     state: present
   when:
@@ -8,7 +8,7 @@
     ansible_facts['distribution_major_version'] is version("7")
 
 - name: Ensure passlib is installed on rocky9
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: python3-passlib
     state: present
   when:
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 5edb101a..a4467861 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -25,12 +25,12 @@
         ansible_facts['distribution_major_version'] is version("8", ">=")
 
 - name: Ensure epel is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: installed
 
 - name: Ensure nginx is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - nginx
       - nginx-mod-stream
diff --git a/roles/omero_server/tasks/omero-systemd.yml b/roles/omero_server/tasks/omero-systemd.yml
index ee8dafba..7913d1fc 100644
--- a/roles/omero_server/tasks/omero-systemd.yml
+++ b/roles/omero_server/tasks/omero-systemd.yml
@@ -9,7 +9,7 @@
     src: systemd-system-omero-server-service.j2
     mode: "0644"
   notify:
-    - reload systemd # handler from ome.common
+    - Reload systemd # handler from ome.common
     - Restart omero-server
 
 # Flush handlers to ensure systemd is reloaded
diff --git a/roles/omero_server/tasks/pre-tasks.yml b/roles/omero_server/tasks/pre-tasks.yml
index ee556397..15adaee4 100644
--- a/roles/omero_server/tasks/pre-tasks.yml
+++ b/roles/omero_server/tasks/pre-tasks.yml
@@ -18,13 +18,13 @@
     ice_install_python: false
 
 - name: Ensure postgres RPM is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ postgresql_install.rpm }}"
     state: present
     disable_gpg_check: "{{ postgresql_install.disable_gpg_check }}"
 
 - name: Ensure postgresql is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ postgresql_install.yum_client_package }}"
     state: installed
 
diff --git a/roles/postgresql/README.md b/roles/postgresql/README.md
index 7f73a152..4f6b424f 100644
--- a/roles/postgresql/README.md
+++ b/roles/postgresql/README.md
@@ -92,7 +92,7 @@ To use this role with a dual-server setup (a dartase `db` and a web server
   gather_facts: true
   tasks:
     - name: Install openssl
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: openssl
         state: present
 
diff --git a/roles/postgresql/molecule/resources/prepare.yml b/roles/postgresql/molecule/resources/prepare.yml
index a4f3bd1f..7f2b067a 100644
--- a/roles/postgresql/molecule/resources/prepare.yml
+++ b/roles/postgresql/molecule/resources/prepare.yml
@@ -11,7 +11,7 @@
     - role: mirsg.infrastructure.provision
   tasks:
     - name: Install crontabs
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: cronie
         state: present
 
diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
index 69f60fb3..1ba054f1 100644
--- a/roles/postgresql/tasks/main.yml
+++ b/roles/postgresql/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for postgresql
 - name: Setup for RedHat 7 - install sefcontext dependencies and psycopg2
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - libselinux-python
       - policycoreutils-python
@@ -12,7 +12,7 @@
     ansible_facts['distribution_major_version'] is version('7')
 
 - name: Setup for RedHat 8+ - install sefcontext dependencies and psycopg2
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - python3-libselinux
       - policycoreutils-python-utils
@@ -23,18 +23,18 @@
     ansible_facts['distribution_major_version'] is version('7', '>')
 
 - name: Ensure postgres RPM is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ postgresql_install.rpm }}"
     state: present
     disable_gpg_check: "{{ postgresql_install.disable_gpg_check }}"
 
 - name: Ensure postgresql is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ postgresql_install.yum_package }}"
     state: installed
 
 - name: Ensure postgresql contrib is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ postgresql_install.yum_contrib_package }}"
     state: installed
   when:
diff --git a/roles/postgresql_upgrade/molecule/resources/prepare.yml b/roles/postgresql_upgrade/molecule/resources/prepare.yml
index 8d35b262..8ba1b099 100644
--- a/roles/postgresql_upgrade/molecule/resources/prepare.yml
+++ b/roles/postgresql_upgrade/molecule/resources/prepare.yml
@@ -9,7 +9,7 @@
         state: present
 
     - name: Install crontabs
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: cronie
         state: present
 
diff --git a/roles/provision/tasks/CentOS.yml b/roles/provision/tasks/CentOS.yml
index 35f1d075..abab66f5 100644
--- a/roles/provision/tasks/CentOS.yml
+++ b/roles/provision/tasks/CentOS.yml
@@ -35,7 +35,7 @@
         state: absent
 
     - name: Install locales # noqa: package-latest
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: glibc-common
         state: latest
 
diff --git a/roles/provision/tasks/Rocky.yml b/roles/provision/tasks/Rocky.yml
index 635f9ca1..a1b0bf88 100644
--- a/roles/provision/tasks/Rocky.yml
+++ b/roles/provision/tasks/Rocky.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure the ca-certificates package is installed
   become: true
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: ca-certificates
     state: present
 
@@ -30,7 +30,7 @@
   when: found_locale.rc != 0
   block:
     - name: Install locale
-      ansible.builtin.yum:
+      ansible.builtin.dnf:
         name: glibc-langpack-en
         state: present
 
diff --git a/roles/provision/tasks/main.yml b/roles/provision/tasks/main.yml
index 934db2da..e87ec27e 100644
--- a/roles/provision/tasks/main.yml
+++ b/roles/provision/tasks/main.yml
@@ -8,7 +8,7 @@
   ansible.builtin.include_tasks: "{{ ansible_distribution }}.yml"
 
 - name: Upgrade all packages # noqa: package-latest
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "*"
     state: latest
     exclude:
@@ -20,6 +20,6 @@
 
 - name: Ensure epel is installed
   become: true
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: installed
diff --git a/roles/ssl_certificates/README.md b/roles/ssl_certificates/README.md
index 21a50120..df1e2eb7 100644
--- a/roles/ssl_certificates/README.md
+++ b/roles/ssl_certificates/README.md
@@ -13,7 +13,7 @@ installed before using this role:
 
 ```yaml
 - name: Install openssl
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: openssl
     state: present
   when: ssl_certificate.use_pk8
diff --git a/roles/tomcat/tasks/main.yml b/roles/tomcat/tasks/main.yml
index 4982443a..00684d11 100644
--- a/roles/tomcat/tasks/main.yml
+++ b/roles/tomcat/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure Ansible seport dependencies are installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - libselinux-python
       - policycoreutils-python
@@ -10,7 +10,7 @@
     ansible_facts['distribution_major_version'] is version('7')
 
 - name: Ensure Ansible seport dependencies are installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - python3-libselinux
       - policycoreutils-python-utils
@@ -20,12 +20,12 @@
     ansible_facts['distribution_major_version'] is version("8", ">=")
 
 - name: Ensure epel is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: installed
 
 - name: Ensure Tomcat Native library is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: tomcat-native
     state: installed
 
@@ -122,7 +122,7 @@
     - name: Trigger restart tomcat
       ansible.builtin.debug:
         msg: trigger restart tomcat
-      notify: restart tomcat
+      notify: Restart tomcat
       changed_when: false
     - name: Force handler to run now
       ansible.builtin.meta: flush_handlers
diff --git a/roles/xnat/tasks/main.yml b/roles/xnat/tasks/main.yml
index 72325753..5fb5a2fa 100644
--- a/roles/xnat/tasks/main.yml
+++ b/roles/xnat/tasks/main.yml
@@ -8,7 +8,7 @@
     ansible_facts['distribution_major_version'] is version('8', '>=')
 
 - name: Ensure dependencies are installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name:
       - postgresql
       - wget
diff --git a/roles/xnat/tasks/plugins.yml b/roles/xnat/tasks/plugins.yml
index 7d6e0484..81fa7685 100644
--- a/roles/xnat/tasks/plugins.yml
+++ b/roles/xnat/tasks/plugins.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure unzip is installed
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: unzip
     state: installed