diff --git a/contrib/test/ci/build/crun.yml b/contrib/test/ci/build/crun.yml
index e63e168bc08..f470feb8b69 100644
--- a/contrib/test/ci/build/crun.yml
+++ b/contrib/test/ci/build/crun.yml
@@ -20,7 +20,6 @@
       yajl-devel \
       libseccomp-devel \
       libselinux-devel \
-      go-md2man \
       glibc-static \
       python3-libmount \
       libtool \
@@ -28,6 +27,31 @@
       gperf \
       libtool
 
+- name: Install go-md2man for RHEL9
+  block:
+    - name: clone go-md2man source repo
+      git:
+        repo: "https://github.com/cpuguy83/go-md2man.git"
+        dest: "{{ ansible_env.GOPATH }}/src/github.com/cpuguy83/go-md2man"
+        version: v2.0.2 
+
+    - name: build go-md2man
+      make:
+        chdir: "{{ ansible_env.GOPATH }}/src/github.com/cpuguy83/go-md2man"
+        target: "build"
+
+    - name: copy go-md2man
+      copy:
+        src: "{{ ansible_env.GOPATH }}/src/github.com/cpuguy83/go-md2man/bin/go-md2man"
+        dest: "{{ ansible_env.GOPATH }}/bin/go-md2man"
+        mode: "preserve"
+  when: (ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 9)
+
+- name: Install go-md2man for RHEL8/Fedora/CentOS
+  raw: >
+    yum install -y go-md2man
+  when: (ansible_distribution in ['RedHat', 'CentOS', 'Fedora']  and ansible_distribution_major_version|int != 9)
+
 - name: Run autogen.sh
   command: "{{ ansible_env.GOPATH }}/src/github.com/containers/crun/autogen.sh"
   args:
diff --git a/contrib/test/ci/system-packages.yml b/contrib/test/ci/system-packages.yml
index 7d815d4b7c3..925d6e380da 100644
--- a/contrib/test/ci/system-packages.yml
+++ b/contrib/test/ci/system-packages.yml
@@ -105,4 +105,7 @@
 
 - name: Update all packages RHEL 8, CentOS 8 and Fedora >= 30
   shell: sudo yum update -y
-  when: supports_python3 is defined and supports_python3
+  when:
+    - supports_python3 is defined 
+    - supports_python3
+    - (ansible_distribution in ['RedHat', 'CentOS', 'Fedora']  and ansible_distribution_major_version|int != 9)