diff --git a/tasks/section_1/cis_1.8.x.yml b/tasks/section_1/cis_1.8.x.yml
index b9ef20d7..71552502 100644
--- a/tasks/section_1/cis_1.8.x.yml
+++ b/tasks/section_1/cis_1.8.x.yml
@@ -7,6 +7,7 @@
   when:
       - rhel8cis_rule_1_8_1
       - "'gdm' in ansible_facts.packages"
+      - not rhel8cis_gui
   tags:
       - level2-server
       - automated
diff --git a/tasks/section_2/cis_2.2.x.yml b/tasks/section_2/cis_2.2.x.yml
index 3290a58f..8df78aea 100644
--- a/tasks/section_2/cis_2.2.x.yml
+++ b/tasks/section_2/cis_2.2.x.yml
@@ -22,6 +22,7 @@
   when:
       - rhel8cis_rule_2_2_2
       - "'xorg-x11-server-common' in ansible_facts.packages"
+      - not rhel8cis_xwindows_required or not rhel8cis_gui
   tags:
       - level1-server
       - automated