diff --git a/tasks/section_3/cis_3.4.1.1.yml b/tasks/section_3/cis_3.4.1.1.yml
index 3373d97..fc78b06 100644
--- a/tasks/section_3/cis_3.4.1.1.yml
+++ b/tasks/section_3/cis_3.4.1.1.yml
@@ -6,6 +6,7 @@
       state: present
   when:
       - rhel9cis_rule_3_4_1_1
+      - not system_is_container
   tags:
       - level1-server
       - level1-workstation
diff --git a/tasks/section_4/cis_4.1.1.x.yml b/tasks/section_4/cis_4.1.1.x.yml
index 13b49d9..ff7b490 100644
--- a/tasks/section_4/cis_4.1.1.x.yml
+++ b/tasks/section_4/cis_4.1.1.x.yml
@@ -29,7 +29,7 @@
   when:
       - not rhel9cis_skip_for_travis
       - rhel9cis_rule_4_1_1_2
-      - ansible_connection != 'docker'
+      - not system_is_container
   tags:
       - level2-server
       - level2-workstation
diff --git a/tasks/section_4/main.yml b/tasks/section_4/main.yml
index 910a9e2..de1643c 100644
--- a/tasks/section_4/main.yml
+++ b/tasks/section_4/main.yml
@@ -2,6 +2,8 @@
 
 - name: "SECTION | 4.1| Configure System Accounting (auditd)"
   include_tasks: cis_4.1.1.x.yml
+  when:
+      - not system_is_container
 
 - name: "SECTION | 4.1.2.x| Configure Data Retention"
   include_tasks: cis_4.1.2.x.yml