diff --git a/plans/ci.fmf b/plans/ci.fmf
index 7249575..7749a2d 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -2,14 +2,29 @@ summary: CI Gating Plan
 discover:
     how: fmf
     directory: tests
+
+prepare:
+  - name: Workaround for glibc32 conflict
+    how: shell
+    order: 10
+    script: |
+      if [[ "$(uname -m)" == "x86_64" ]] && rpm -q glibc32 &>/dev/null; then
+         echo "Remove glibc32 to avoid conflict with glibc.i686"
+         dnf remove -y glibc32
+      fi
+
 adjust:
   - when: distro == rhel
     prepare+:
-      - how: shell
+      - name: Enable RHEL CRB
+        how: shell
+        order: 20
         script:  dnf config-manager --set-enabled *-CRB
   - when: distro == centos
     prepare+:
-      - how: shell
+      - name: Enable CentOS CRB
+        how: shell
+        order: 20
         script:  dnf config-manager --set-enabled crb
 execute:
     how: tmt