diff --git a/roles/config_drive/tasks/main.yml b/roles/config_drive/tasks/main.yml
index e41c89ba16..6999fb70c0 100644
--- a/roles/config_drive/tasks/main.yml
+++ b/roles/config_drive/tasks/main.yml
@@ -23,13 +23,14 @@
     - artifacts
     - logs
 
+# xorriso provides genisoimage since RHEL 9
 - name: Install required RPM packages
   tags:
     - packages
   become: true
   ansible.builtin.package:
     name:
-      - genisoimage
+      - xorriso
       - gzip
       - coreutils
     state: present
@@ -97,7 +98,7 @@
     output_dir: "{{ cifmw_config_drive_basedir }}/artifacts"
     creates: "{{ cifmw_config_drive_iso_image }}"
     script: >-
-      genisoimage -output {{ cifmw_config_drive_iso_image }} -volid CIDATA
+      xorrisofs -output {{ cifmw_config_drive_iso_image }} -volid CIDATA
       -joliet
       -rock user-data meta-data
       {% if cifmw_config_drive_networkconfig is defined and
diff --git a/roles/devscripts/vars/main.yml b/roles/devscripts/vars/main.yml
index 1dbfc6b557..301c660264 100644
--- a/roles/devscripts/vars/main.yml
+++ b/roles/devscripts/vars/main.yml
@@ -23,7 +23,6 @@
 
 cifmw_devscripts_packages:
   - ipmitool
-  - NetworkManager-initscripts-updown
   - patch
   - python3-jmespath
   - buildah
diff --git a/roles/dnsmasq/tasks/configure.yml b/roles/dnsmasq/tasks/configure.yml
index aae7406e65..5bb90c5692 100644
--- a/roles/dnsmasq/tasks/configure.yml
+++ b/roles/dnsmasq/tasks/configure.yml
@@ -31,7 +31,7 @@
       setype: "dnsmasq_etc_t"
     - target: "{{ cifmw_dnsmasq_basedir }}(/.*)?"
       setype: "dnsmasq_etc_t"
-    - target: "/var/run/cifmw-dnsmasq.pid"
+    - target: "/run/cifmw-dnsmasq.pid"
       setype: "dnsmasq_var_run_t"
 
 - name: Manage configuration directory
diff --git a/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2 b/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2
index 2054bf4382..18cac38fab 100644
--- a/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2
+++ b/roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2
@@ -1,7 +1,7 @@
 # Managed by ci-framework/dnsmasq
 user=dnsmasq
 group=dnsmasq
-pid-file=/var/run/cifmw-dnsmasq.pid
+pid-file=/run/cifmw-dnsmasq.pid
 dhcp-leasefile=/var/lib/dnsmasq/cifmw-dnsmasq.leases
 
 {% if cifmw_dnsmasq_raw_config | length > 0 -%}