diff --git a/.github/workflows/add_repo_issue_to_gh_project.yml b/.github/workflows/add_repo_issue_to_gh_project.yml
new file mode 100644
index 0000000..80d7344
--- /dev/null
+++ b/.github/workflows/add_repo_issue_to_gh_project.yml
@@ -0,0 +1,17 @@
+---
+
+name: Add Repo Issue to ALD GH project
+on:
+  issues:
+    types:
+      - opened
+      - reopened
+      - transferred
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/ansible-lockdown/projects/1
+          github-token: ${{ secrets.ALD_GH_PROJECT }}
diff --git a/.github/workflows/benchmark_tracking_controller.yml b/.github/workflows/benchmark_tracking_controller.yml
new file mode 100644
index 0000000..039ec0d
--- /dev/null
+++ b/.github/workflows/benchmark_tracking_controller.yml
@@ -0,0 +1,54 @@
+---
+
+# GitHub schedules all cron jobs in UTC.
+# ──────────────────────────────────────────────────────────────────────────────
+# Schedule:
+#   - '0 13 * * *' runs at 13:00 UTC every day.
+#   - This corresponds to:
+#       • 9:00 AM Eastern **during Daylight Saving Time** (mid-Mar → early-Nov)
+#       • 8:00 AM Eastern **during Standard Time** (early-Nov → mid-Mar)
+#
+# Job routing:
+#   - call-benchmark-tracker:
+#       • Runs on manual dispatch, and on pushes to the 'latest' branch.
+#   - call-monitor-promotions:
+#       • Runs on schedule or manual dispatch **only in repos named ansible-lockdown/Private-***.
+#       • Skips automatically in public repos (e.g., Windows-2022-CIS) to avoid false failures.
+#
+# Defense-in-depth:
+#   - The called promotion workflow may still keep its own guard to ensure only Private-* repos execute it.
+
+name: Central Benchmark Orchestrator
+
+on:
+  push:
+    branches:
+      - latest
+  schedule:
+    - cron: '0 13 * * *'  # 13:00 UTC → 9 AM ET (DST) / 8 AM ET (Standard Time)
+  workflow_dispatch:
+
+jobs:
+  call-benchmark-tracker:
+    # Run on manual dispatch OR when 'latest' branch receives a push
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref_name == 'latest')
+    name: Start Benchmark Tracker
+    uses: ansible-lockdown/github_linux_IaC/.github/workflows/benchmark_track.yml@self_hosted
+    with:
+      repo_name: ${{ github.repository }}
+    secrets:
+      TEAMS_WEBHOOK_URL: ${{ secrets.TEAMS_WEBHOOK_URL }}
+      BADGE_PUSH_TOKEN: ${{ secrets.BADGE_PUSH_TOKEN }}
+      DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+
+  call-monitor-promotions:
+    # Run on schedule or manual dispatch, but only for Private-* repos
+    if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && startsWith(github.repository, 'ansible-lockdown/Private-')
+    name: Monitor Promotions and Auto-Promote
+    uses: ansible-lockdown/github_linux_IaC/.github/workflows/benchmark_promote.yml@self_hosted
+    with:
+      repo_name: ${{ github.repository }}
+    secrets:
+      TEAMS_WEBHOOK_URL: ${{ secrets.TEAMS_WEBHOOK_URL }}
+      BADGE_PUSH_TOKEN: ${{ secrets.BADGE_PUSH_TOKEN }}
+      DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
diff --git a/.github/workflows/devel_pipeline_validation.yml b/.github/workflows/devel_pipeline_validation.yml
index c9328cb..8fd728a 100644
--- a/.github/workflows/devel_pipeline_validation.yml
+++ b/.github/workflows/devel_pipeline_validation.yml
@@ -4,155 +4,159 @@
 
   on: # yamllint disable-line rule:truthy
     pull_request_target:
-        types: [opened, reopened, synchronize]
-        branches:
-            - devel
-        paths:
-            - '**.yml'
-            - '**.sh'
-            - '**.j2'
-            - '**.ps1'
-            - '**.cfg'
+      types: [opened, reopened, synchronize]
+      branches:
+        - devel
+        - benchmark*
+      paths:
+        - '**.yml'
+        - '**.sh'
+        - '**.j2'
+        - '**.ps1'
+        - '**.cfg'
     # Allow manual running of workflow
     workflow_dispatch:
 
-  # Allow permissions for AWS auth
-  permissions:
-    id-token: write
-    contents: read
-    pull-requests: read
-
   # A workflow run is made up of one or more jobs
   # that can run sequentially or in parallel
   jobs:
     # This will create messages for first time contributers and direct them to the Discord server
-      welcome:
-        runs-on: ubuntu-latest
+    welcome:
+      runs-on: ubuntu-latest
 
-        steps:
-            - uses: actions/first-interaction@main
-              with:
-                repo-token: ${{ secrets.GITHUB_TOKEN }}
-                pr-message: |-
-                    Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
-                    Please join in the conversation happening on the [Discord Server](https://www.lockdownenterprise.com/discord) as well.
+      permissions:
+        issues: write
+        pull-requests: write
 
-      # This workflow contains a single job that tests the playbook
-      playbook-test:
-        # The type of runner that the job will run on
-        runs-on: self-hosted
-        env:
-          ENABLE_DEBUG: ${{ vars.ENABLE_DEBUG }}
-          # Imported as a variable by terraform
-          TF_VAR_repository: ${{ github.event.repository.name }}
-          AWS_REGION: "us-east-1"
-          ANSIBLE_VERSION: ${{ vars.ANSIBLE_RUNNER_VERSION }}
-        defaults:
-          run:
-            shell: bash
-            working-directory: .github/workflows/github_linux_IaC
-            # working-directory: .github/workflows
+      steps:
+        - uses: actions/first-interaction@main
+          with:
+            repo_token: ${{ secrets.GITHUB_TOKEN }}
+            issue_message: |-
+                Congrats on opening your first issue and thank you for taking the time to help improve Ansible-Lockdown!
+                Please join in the conversation happening on the [Discord Server](https://www.lockdownenterprise.com/discord) as well.
+            pr_message: |-
+                Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
+                Please join in the conversation happening on the [Discord Server](https://www.lockdownenterprise.com/discord) as well.
 
-        steps:
+    # This workflow contains a single job that tests the playbook
+    playbook-test:
+      # The type of runner that the job will run on
+      runs-on: self-hosted
 
-          - name: Git clone the lockdown repository to test
-            uses: actions/checkout@v4
-            with:
-              ref: ${{ github.event.pull_request.head.sha }}
+      # Allow permissions for AWS auth
+      permissions:
+        id-token: write
+        contents: read
+        pull-requests: read
 
-          - name: If a variable for IAC_BRANCH is set use that branch
-            working-directory: .github/workflows
-            run: |
-              if [ ${{ vars.IAC_BRANCH }} != '' ]; then
-                 echo "IAC_BRANCH=${{ vars.IAC_BRANCH }}" >> $GITHUB_ENV
-                 echo "Pipeline using the following IAC branch ${{ vars.IAC_BRANCH }}"
-              else
-                 echo IAC_BRANCH=main >> $GITHUB_ENV
-              fi
+      env:
+        ENABLE_DEBUG: ${{ vars.ENABLE_DEBUG }}
+        # Imported as a variable by terraform
+        TF_VAR_repository: ${{ github.event.repository.name }}
+        AWS_REGION: "us-east-1"
+        ANSIBLE_VERSION: ${{ vars.ANSIBLE_RUNNER_VERSION }}
+      defaults:
+        run:
+          shell: bash
+          working-directory: .github/workflows/github_linux_IaC
+          # working-directory: .github/workflows
 
-          # Pull in terraform code for linux servers
-          - name: Clone GitHub IaC plan
-            uses: actions/checkout@v4
-            with:
-              repository: ansible-lockdown/github_linux_IaC
-              path: .github/workflows/github_linux_IaC
-              ref: ${{ env.IAC_BRANCH }}
+      steps:
 
-          # Uses dedicated restricted role and policy to enable this only for this task
-          # No credentials are part of github for AWS auth
-          - name: configure aws credentials
-            uses: aws-actions/configure-aws-credentials@main
-            with:
-              role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
-              role-session-name: ${{ secrets.AWS_ROLE_SESSION }}
-              aws-region: ${{ env.AWS_REGION }}
+        - name: Git clone the lockdown repository to test
+          uses: actions/checkout@v4
+          with:
+            ref: ${{ github.event.pull_request.head.sha }}
 
-          - name: DEBUG - Show IaC files
-            if: env.ENABLE_DEBUG == 'true'
-            run: |
-              echo "OSVAR = $OSVAR"
-              echo "benchmark_type = $benchmark_type"
-              echo "PRIVSUBNET_ID = $AWS_PRIVSUBNET_ID"
-              echo "VPC_ID" = $AWS_VPC_SECGRP_ID"
-              pwd
-              ls
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              PRIVSUBNET_ID: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              VPC_ID: ${{ secrets.AWS_VPC_SECGRP_ID }}
+        - name: If a variable for IAC_BRANCH is set use that branch
+          working-directory: .github/workflows
+          run: |
+            if [ ${{ vars.IAC_BRANCH }} != '' ]; then
+                echo "IAC_BRANCH=${{ vars.IAC_BRANCH }}" >> $GITHUB_ENV
+                echo "Pipeline using the following IAC branch ${{ vars.IAC_BRANCH }}"
+            else
+                echo IAC_BRANCH=main >> $GITHUB_ENV
+            fi
 
-          - name: Tofu init
-            id: init
-            run: tofu init
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+        # Pull in terraform code for linux servers
+        - name: Clone GitHub IaC plan
+          uses: actions/checkout@v4
+          with:
+            repository: ansible-lockdown/github_linux_IaC
+            path: .github/workflows/github_linux_IaC
+            ref: ${{ env.IAC_BRANCH }}
 
-          - name: Tofu validate
-            id: validate
-            run: tofu validate
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+        # Uses dedicated restricted role and policy to enable this only for this task
+        # No credentials are part of github for AWS auth
+        - name: configure aws credentials
+          uses: aws-actions/configure-aws-credentials@main
+          with:
+            role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
+            role-session-name: ${{ secrets.AWS_ROLE_SESSION }}
+            aws-region: ${{ env.AWS_REGION }}
 
-          - name: Tofu apply
-            id: apply
-            env:
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
-            run: tofu apply -var-file "${OSVAR}.tfvars" --auto-approve -input=false
+        - name: DEBUG - Show IaC files
+          if: env.ENABLE_DEBUG == 'true'
+          run: |
+            echo "OSVAR = $OSVAR"
+            echo "benchmark_type = $benchmark_type"
+            pwd
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+
+        - name: Tofu init
+          id: init
+          run: tofu init
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+
+        - name: Tofu validate
+          id: validate
+          run: tofu validate
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+
+        - name: Tofu apply
+          id: apply
+          env:
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+            TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
+            TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
+          run: tofu apply -var-file "${OSVAR}.tfvars" --auto-approve -input=false
 
 ## Debug Section
-          - name: DEBUG - Show Ansible hostfile
-            if: env.ENABLE_DEBUG == 'true'
-            run: cat hosts.yml
+        - name: DEBUG - Show Ansible hostfile
+          if: env.ENABLE_DEBUG == 'true'
+          run: cat hosts.yml
 
-    # Aws deployments taking a while to come up insert sleep or playbook fails
+  # Aws deployments taking a while to come up insert sleep or playbook fails
 
-          - name: Sleep to allow system to come up
-            run: sleep ${{ vars.BUILD_SLEEPTIME }}
+        - name: Sleep to allow system to come up
+          run: sleep ${{ vars.BUILD_SLEEPTIME }}
 
-        # Run the Ansible playbook
-          - name: Run_Ansible_Playbook
-            env:
-              ANSIBLE_HOST_KEY_CHECKING: "false"
-              ANSIBLE_DEPRECATION_WARNINGS: "false"
-            run: |
-              /opt/ansible_${{ env.ANSIBLE_VERSION }}_venv/bin/ansible-playbook -i hosts.yml --private-key ~/.ssh/le_runner ../../../site.yml
+      # Run the Ansible playbook
+        - name: Run_Ansible_Playbook
+          env:
+            ANSIBLE_HOST_KEY_CHECKING: "false"
+            ANSIBLE_DEPRECATION_WARNINGS: "false"
+          run: |
+            /opt/ansible_${{ env.ANSIBLE_VERSION }}_venv/bin/ansible-playbook -i hosts.yml --private-key ~/.ssh/le_runner ../../../site.yml
 
-        # Remove test system - User secrets to keep if necessary
+      # Remove test system - User secrets to keep if necessary
 
-          - name: Tofu Destroy
-            if: always() && env.ENABLE_DEBUG == 'false'
-            env:
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
-            run: tofu destroy -var-file "${OSVAR}.tfvars" --auto-approve -input=false
+        - name: Tofu Destroy
+          if: always() && env.ENABLE_DEBUG == 'false'
+          env:
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+            TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
+            TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
+          run: tofu destroy -var-file "${OSVAR}.tfvars" --auto-approve -input=false
diff --git a/.github/workflows/export_badges_private.yml b/.github/workflows/export_badges_private.yml
new file mode 100644
index 0000000..d316cbf
--- /dev/null
+++ b/.github/workflows/export_badges_private.yml
@@ -0,0 +1,27 @@
+---
+
+name: Export Private Repo Badges
+
+# Use different minute offsets with the same hourly pattern:
+# Repo Group Suggested Cron Expression Explanation
+# Group A 0 */6 * * * Starts at top of hour
+# Group B 10 */6 * * * Starts at 10 after
+# And So On
+
+on:
+  push:
+    branches:
+      - latest
+  schedule:
+    - cron: '0 */6 * * *'
+  workflow_dispatch:
+
+jobs:
+  export-badges:
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'schedule' && startsWith(github.repository, 'ansible-lockdown/Private-')) || (github.event_name == 'push' && github.ref_name == 'latest')
+    uses: ansible-lockdown/github_linux_IaC/.github/workflows/export_badges_private.yml@self_hosted
+    with:
+      # Full org/repo path passed for GitHub API calls (e.g., ansible-lockdown/Private-Windows-2016-CIS)
+      repo_name: ${{ github.repository }}
+    secrets:
+      BADGE_PUSH_TOKEN: ${{ secrets.BADGE_PUSH_TOKEN }}
diff --git a/.github/workflows/export_badges_public.yml b/.github/workflows/export_badges_public.yml
new file mode 100644
index 0000000..fa4b27f
--- /dev/null
+++ b/.github/workflows/export_badges_public.yml
@@ -0,0 +1,19 @@
+---
+
+name: Export Public Repo Badges
+
+on:
+  push:
+    branches:
+      - main
+      - devel
+  workflow_dispatch:
+
+jobs:
+  export-badges:
+    if: github.repository_visibility == 'public' && (github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (github.ref_name == 'devel' || github.ref_name == 'main')))
+    uses: ansible-lockdown/github_linux_IaC/.github/workflows/export_badges_public.yml@self_hosted
+    with:
+      repo_name: ${{ github.repository }}
+    secrets:
+      BADGE_PUSH_TOKEN: ${{ secrets.BADGE_PUSH_TOKEN }}
diff --git a/.github/workflows/main_pipeline_validation.yml b/.github/workflows/main_pipeline_validation.yml
index ab11c37..6c1d2ea 100644
--- a/.github/workflows/main_pipeline_validation.yml
+++ b/.github/workflows/main_pipeline_validation.yml
@@ -4,15 +4,16 @@
 
   on: # yamllint disable-line rule:truthy
     pull_request_target:
-        types: [opened, reopened, synchronize]
-        branches:
-            - main
-        paths:
-            - '**.yml'
-            - '**.sh'
-            - '**.j2'
-            - '**.ps1'
-            - '**.cfg'
+      types: [opened, reopened, synchronize]
+      branches:
+        - main
+        - latest
+      paths:
+        - '**.yml'
+        - '**.sh'
+        - '**.j2'
+        - '**.ps1'
+        - '**.cfg'
 
   # Allow permissions for AWS auth
   permissions:
@@ -23,122 +24,118 @@
   # A workflow run is made up of one or more jobs
   # that can run sequentially or in parallel
   jobs:
-      # This workflow contains a single job that tests the playbook
-      playbook-test:
-        # The type of runner that the job will run on
-        runs-on: self-hosted
-        env:
-          ENABLE_DEBUG: ${{ vars.ENABLE_DEBUG }}
-          # Imported as a variable by terraform
-          TF_VAR_repository: ${{ github.event.repository.name }}
-          AWS_REGION : "us-east-1"
-          ANSIBLE_VERSION: ${{ vars.ANSIBLE_RUNNER_VERSION }}
-        defaults:
-          run:
-            shell: bash
-            working-directory: .github/workflows/github_linux_IaC
-            # working-directory: .github/workflows
+    # This workflow contains a single job that tests the playbook
+    playbook-test:
+      # The type of runner that the job will run on
+      runs-on: self-hosted
+      env:
+        ENABLE_DEBUG: ${{ vars.ENABLE_DEBUG }}
+        # Imported as a variable by terraform
+        TF_VAR_repository: ${{ github.event.repository.name }}
+        AWS_REGION : "us-east-1"
+        ANSIBLE_VERSION: ${{ vars.ANSIBLE_RUNNER_VERSION }}
+      defaults:
+        run:
+          shell: bash
+          working-directory: .github/workflows/github_linux_IaC
+          # working-directory: .github/workflows
 
-        steps:
+      steps:
 
-          - name: Git clone the lockdown repository to test
-            uses: actions/checkout@v4
-            with:
-              ref: ${{ github.event.pull_request.head.sha }}
+        - name: Git clone the lockdown repository to test
+          uses: actions/checkout@v4
+          with:
+            ref: ${{ github.event.pull_request.head.sha }}
 
-          - name: If a variable for IAC_BRANCH is set use that branch
-            working-directory: .github/workflows
-            run: |
-              if [ ${{ vars.IAC_BRANCH }} != '' ]; then
-                 echo "IAC_BRANCH=${{ vars.IAC_BRANCH }}" >> $GITHUB_ENV
-                 echo "Pipeline using the following IAC branch ${{ vars.IAC_BRANCH }}"
-              else
-                 echo IAC_BRANCH=main >> $GITHUB_ENV
-              fi
+        - name: If a variable for IAC_BRANCH is set use that branch
+          working-directory: .github/workflows
+          run: |
+            if [ ${{ vars.IAC_BRANCH }} != '' ]; then
+              echo "IAC_BRANCH=${{ vars.IAC_BRANCH }}" >> $GITHUB_ENV
+              echo "Pipeline using the following IAC branch ${{ vars.IAC_BRANCH }}"
+            else
+              echo IAC_BRANCH=main >> $GITHUB_ENV
+            fi
 
-          # Pull in terraform code for linux servers
-          - name: Clone GitHub IaC plan
-            uses: actions/checkout@v4
-            with:
-              repository: ansible-lockdown/github_linux_IaC
-              path: .github/workflows/github_linux_IaC
-              ref: ${{ env.IAC_BRANCH }}
+        # Pull in terraform code for linux servers
+        - name: Clone GitHub IaC plan
+          uses: actions/checkout@v4
+          with:
+            repository: ansible-lockdown/github_linux_IaC
+            path: .github/workflows/github_linux_IaC
+            ref: ${{ env.IAC_BRANCH }}
 
-          # Uses dedicated restricted role and policy to enable this only for this task
-          # No credentials are part of github for AWS auth
-          - name: configure aws credentials
-            uses: aws-actions/configure-aws-credentials@main
-            with:
-              role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
-              role-session-name: ${{ secrets.AWS_ROLE_SESSION }}
-              aws-region: ${{ env.AWS_REGION }}
+        # Uses dedicated restricted role and policy to enable this only for this task
+        # No credentials are part of github for AWS auth
+        - name: configure aws credentials
+          uses: aws-actions/configure-aws-credentials@main
+          with:
+            role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
+            role-session-name: ${{ secrets.AWS_ROLE_SESSION }}
+            aws-region: ${{ env.AWS_REGION }}
 
-          - name: DEBUG - Show IaC files
-            if: env.ENABLE_DEBUG == 'true'
-            run: |
-              echo "OSVAR = $OSVAR"
-              echo "benchmark_type = $benchmark_type"
-              echo "PRIVSUBNET_ID = $AWS_PRIVSUBNET_ID"
-              echo "VPC_ID" = $AWS_VPC_SECGRP_ID"
-              pwd
-              ls
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              PRIVSUBNET_ID: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              VPC_ID: ${{ secrets.AWS_VPC_SECGRP_ID }}
+        - name: DEBUG - Show IaC files
+          if: env.ENABLE_DEBUG == 'true'
+          run: |
+            echo "OSVAR = $OSVAR"
+            echo "benchmark_type = $benchmark_type"
+            pwd
+            ls
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            benchmark_type: ${{ vars.BENCHMARK_TYPE }}
 
-          - name: Tofu init
-            id: init
-            run: tofu init
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+        - name: Tofu init
+          id: init
+          run: tofu init
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
 
-          - name: Tofu validate
-            id: validate
-            run: tofu validate
-            env:
-              # Imported from GitHub variables this is used to load the relevant OS.tfvars file
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+        - name: Tofu validate
+          id: validate
+          run: tofu validate
+          env:
+            # Imported from GitHub variables this is used to load the relevant OS.tfvars file
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
 
-          - name: Tofu apply
-            id: apply
-            env:
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
-            run: tofu apply -var-file "${OSVAR}.tfvars" --auto-approve -input=false
+        - name: Tofu apply
+          id: apply
+          env:
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+            TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
+            TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
+          run: tofu apply -var-file "${OSVAR}.tfvars" --auto-approve -input=false
 
 ## Debug Section
-          - name: DEBUG - Show Ansible hostfile
-            if: env.ENABLE_DEBUG == 'true'
-            run: cat hosts.yml
+        - name: DEBUG - Show Ansible hostfile
+          if: env.ENABLE_DEBUG == 'true'
+          run: cat hosts.yml
 
-    # Aws deployments taking a while to come up insert sleep or playbook fails
+  # Aws deployments taking a while to come up insert sleep or playbook fails
 
-          - name: Sleep to allow system to come up
-            run: sleep ${{ vars.BUILD_SLEEPTIME }}
+        - name: Sleep to allow system to come up
+          run: sleep ${{ vars.BUILD_SLEEPTIME }}
 
-        # Run the Ansible playbook
-          - name: Run_Ansible_Playbook
-            env:
-              ANSIBLE_HOST_KEY_CHECKING: "false"
-              ANSIBLE_DEPRECATION_WARNINGS: "false"
-            run: |
-              /opt/ansible_${{ env.ANSIBLE_VERSION }}_venv/bin/ansible-playbook -i hosts.yml --private-key ~/.ssh/le_runner ../../../site.yml
+      # Run the Ansible playbook
+        - name: Run_Ansible_Playbook
+          env:
+            ANSIBLE_HOST_KEY_CHECKING: "false"
+            ANSIBLE_DEPRECATION_WARNINGS: "false"
+          run: |
+            /opt/ansible_${{ env.ANSIBLE_VERSION }}_venv/bin/ansible-playbook -i hosts.yml --private-key ~/.ssh/le_runner ../../../site.yml
 
-        # Remove test system - User secrets to keep if necessary
+      # Remove test system - User secrets to keep if necessary
 
-          - name: Tofu Destroy
-            if: always() && env.ENABLE_DEBUG == 'false'
-            env:
-              OSVAR: ${{ vars.OSVAR }}
-              TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
-              TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
-              TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
-            run: tofu destroy -var-file "${OSVAR}.tfvars" --auto-approve -input=false
+        - name: Tofu Destroy
+          if: always() && env.ENABLE_DEBUG == 'false'
+          env:
+            OSVAR: ${{ vars.OSVAR }}
+            TF_VAR_benchmark_type: ${{ vars.BENCHMARK_TYPE }}
+            TF_VAR_privsubnet_id: ${{ secrets.AWS_PRIVSUBNET_ID }}
+            TF_VAR_vpc_secgrp_id: ${{ secrets.AWS_VPC_SECGRP_ID }}
+          run: tofu destroy -var-file "${OSVAR}.tfvars" --auto-approve -input=false
diff --git a/.github/workflows/update_galaxy.yml b/.github/workflows/update_galaxy.yml
deleted file mode 100644
index b6ee6a1..0000000
--- a/.github/workflows/update_galaxy.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-    name: update galaxy
-
-    on:
-        push:
-            branches:
-                - main
-    jobs:
-        update_role:
-            runs-on: ubuntu-latest
-            steps:
-                - name: Checkout repo
-                  uses: actions/checkout@v4
-
-                - name: Action Ansible Galaxy Release ${{ github.ref_name }}
-                  uses: ansible-actions/ansible-galaxy-action@main
-                  with:
-                    galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}
diff --git a/.gitignore b/.gitignore
index f67408e..de8046f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,6 @@ benchparse/
 
 # GitHub Action/Workflow files
 .github/
+
+# Precommit exclusions
+.ansible/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 401d32e..dbc1d7e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   # Safety
   - id: detect-aws-credentials
@@ -41,12 +41,12 @@ repos:
   - id: detect-secrets
 
 - repo: https://github.com/gitleaks/gitleaks
-  rev: v8.23.3
+  rev: v8.30.0
   hooks:
   - id: gitleaks
 
 - repo: https://github.com/ansible-community/ansible-lint
-  rev: v25.1.2
+  rev: v25.12.2
   hooks:
   - id: ansible-lint
     name: Ansible-lint
@@ -65,7 +65,7 @@ repos:
     # - ansible-core>=2.10.1
 
 - repo: https://github.com/adrienverge/yamllint.git
-  rev: v1.35.1  # or higher tag
+  rev: v1.37.1  # or higher tag
   hooks:
   - id: yamllint
     name: Check YAML Lint
diff --git a/Changelog.md b/Changelog.md
index 4bd1c86..ac9c3b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,52 @@
 # Changes to rhel9CIS
 
+## 2.0.4 - Based on CIS v2.0.0
+
+- addressed issue #393 thank you to @fragglexarmy
+- addressed issue #394 thank you to @dbeuker
+- addressed issues #390 and #391 thanks to @polski-g
+- addressed issue #398 & #399 thanks to trumbaut
+- Added max-concurrent options for audit
+- work flow updates
+- audit logic improvements
+- auditd template 2.19 compatible
+- pre-commit updates
+- #410 thanks to @kpi-nourman
+- #413 thanks to @bbaassssiiee
+
+## 2.0.3 - Based on CIS v2.0.0
+- addressed issue #387, thank you @fragglexarmy
+- addressed issue #382 to improve regex logic on 5.4.2.4
+- improvement on crypto policy managed controls with var logic
+- addressed issue #384 thank you @polski-g
+- update command to shell module on tasks
+- addressed issue 371 thanks to @bgro and kodebach
+- addressed issue 350 thanks to @chrispipo
+- addressed issue 364 thanks to @polski-g
+- pre-commit update
+
+## 2.0.2 - Based on CIS v2.0.0
+
+- Update to audit_only to allow fetching results
+- resolved false warning for fetch audit
+- fix root user check
+- Improved documentation and variable compilation for crypto policies
+- Addresses #318 - Thank you @kodebach & @bgro
+  - Improved logic for 5.2.4 to exclude rhel9cis_sudoers_exclude_nopasswd_list in pre-check tasks/main.yml
+
+## 2.0.1 - Based on CIS v2.0.0
+
+- Thanks to @polski-g several issues and improvements added
+- Improved testing for 50-redhat.conf for ssh
+- 5.1.x regexp improvements
+- Improved root password check
+- egrep command changed to grep -E
+
+## 2.0.0 - Based on CIS v2.0.0
+
+- #322, #325 - thanks to @mindrb
+- #320 - thanks to @anup-ad
+
 ## 1.1.6 - Based on CIS v1.0.0
 
 - #190 - thanks to @ipruteanu-sie
diff --git a/README.md b/README.md
index a16287d..65a8fca 100644
--- a/README.md
+++ b/README.md
@@ -6,61 +6,96 @@
 
 ---
 
+## Public Repository 📣
+
 ![Org Stars](https://img.shields.io/github/stars/ansible-lockdown?label=Org%20Stars&style=social)
 ![Stars](https://img.shields.io/github/stars/ansible-lockdown/RHEL9-CIS?label=Repo%20Stars&style=social)
 ![Forks](https://img.shields.io/github/forks/ansible-lockdown/RHEL9-CIS?style=social)
-![followers](https://img.shields.io/github/followers/ansible-lockdown?style=social)
+![Followers](https://img.shields.io/github/followers/ansible-lockdown?style=social)
 [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/AnsibleLockdown.svg?style=social&label=Follow%20%40AnsibleLockdown)](https://twitter.com/AnsibleLockdown)
-
-![Ansible Galaxy Quality](https://img.shields.io/ansible/quality/61781?label=Quality&&logo=ansible)
 ![Discord Badge](https://img.shields.io/discord/925818806838919229?logo=discord)
 
+![License](https://img.shields.io/github/license/ansible-lockdown/RHEL9-CIS?label=License)
+
+## Lint & Pre-Commit Tools 🔧
+
+[![Pre-Commit.ci](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/RHEL9-CIS/pre-commit-ci.json)](https://results.pre-commit.ci/latest/github/ansible-lockdown/RHEL9-CIS/devel)
+![YamlLint](https://img.shields.io/badge/yamllint-Present-brightgreen?style=flat&logo=yaml&logoColor=white)
+![Ansible-Lint](https://img.shields.io/badge/ansible--lint-Present-brightgreen?style=flat&logo=ansible&logoColor=white)
+
+## Community Release Information 📂
+
 ![Release Branch](https://img.shields.io/badge/Release%20Branch-Main-brightgreen)
-![Release Tag](https://img.shields.io/github/v/release/ansible-lockdown/RHEL9-CIS)
-![Release Date](https://img.shields.io/github/release-date/ansible-lockdown/RHEL9-CIS)
+![Release Tag](https://img.shields.io/github/v/tag/ansible-lockdown/RHEL9-CIS?label=Release%20Tag&&color=success)
+![Main Release Date](https://img.shields.io/github/release-date/ansible-lockdown/RHEL9-CIS?label=Release%20Date)
+![Benchmark Version Main](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/RHEL9-CIS/benchmark-version-main.json)
+![Benchmark Version Devel](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/RHEL9-CIS/benchmark-version-devel.json)
 
 [![Main Pipeline Status](https://github.com/ansible-lockdown/RHEL9-CIS/actions/workflows/main_pipeline_validation.yml/badge.svg?)](https://github.com/ansible-lockdown/RHEL9-CIS/actions/workflows/main_pipeline_validation.yml)
 
 [![Devel Pipeline Status](https://github.com/ansible-lockdown/RHEL9-CIS/actions/workflows/devel_pipeline_validation.yml/badge.svg?)](https://github.com/ansible-lockdown/RHEL9-CIS/actions/workflows/devel_pipeline_validation.yml)
-![Devel Commits](https://img.shields.io/github/commit-activity/m/ansible-lockdown/RHEL9-CIS/devel?color=dark%20green&label=Devel%20Branch%20Commits)
 
-![Issues Open](https://img.shields.io/github/issues-raw/ansible-lockdown/RHEL9-CIS?label=Open%20Issues)
-![Issues Closed](https://img.shields.io/github/issues-closed-raw/ansible-lockdown/RHEL9-CIS?label=Closed%20Issues&&color=success)
+
+![Devel Commits](https://img.shields.io/github/commit-activity/m/ansible-lockdown/RHEL9-CIS/devel?color=dark%20green&label=Devel%20Branch%20Commits)
+![Open Issues](https://img.shields.io/github/issues-raw/ansible-lockdown/RHEL9-CIS?label=Open%20Issues)
+![Closed Issues](https://img.shields.io/github/issues-closed-raw/ansible-lockdown/RHEL9-CIS?label=Closed%20Issues&&color=success)
 ![Pull Requests](https://img.shields.io/github/issues-pr/ansible-lockdown/RHEL9-CIS?label=Pull%20Requests)
 
-![License](https://img.shields.io/github/license/ansible-lockdown/RHEL9-CIS?label=License)
+---
+
+## Subscriber Release Information 🔐
+
+![Private Release Branch](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/release-branch.json)
+![Private Benchmark Version](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/benchmark-version.json)
+
+[![Private Remediate Pipeline](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/remediate.json)](https://github.com/ansible-lockdown/Private-RHEL9-CIS/actions/workflows/main_pipeline_validation.yml)
+[![Private GPO Pipeline](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/gpo.json)](https://github.com/ansible-lockdown/Private-RHEL9-CIS/actions/workflows/main_pipeline_validation_gpo.yml)
+
+![Private Pull Requests](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/prs.json)
+![Private Closed Issues](https://img.shields.io/endpoint?url=https://ansible-lockdown.github.io/github_linux_IaC/badges/Private-RHEL9-CIS/issues-closed.json)
 
 ---
 
-### Community
+## Looking for support? 🤝
 
-Join us on our [Discord Server](https://www.lockdownenterprise.com/discord) to ask questions, discuss features, or just chat with other Ansible-Lockdown users.
+[Lockdown Enterprise](https://www.lockdownenterprise.com#GH_AL_RHEL9-CIS)
+
+[Ansible support](https://www.mindpointgroup.com/cybersecurity-products/ansible-counselor#GH_AL_RHEL9-CIS)
+
+### Community 💬
+
+On our [Discord Server](https://www.lockdownenterprise.com/discord) to ask questions, discuss features, or just chat with other Ansible-Lockdown users
 
 ---
 
-## Caution(s)
+## 🚨 Caution(s) 🚨
 
 This role **will make changes to the system** which may have unintended consequences. This is not an auditing tool but rather a remediation tool to be used after an audit has been conducted.
 
 - Testing is the most important thing you can do.
 
-- Check Mode is not supported! The role will complete in check mode without errors, but it is not supported and should be used with caution. The RHEL9-CIS-Audit role or a compliance scanner should be used for compliance checking over check mode.
+- Check Mode is not guaranteed! 🚫 The role will complete in check mode without errors, but it is not supported and should be used with caution.
 
 - This role was developed against a clean install of the Operating System. If you are implementing to an existing system please review this role for any site specific changes that are needed.
 
-- To use release version please point to main branch and relevant release/tag for the cis benchmark you wish to work with.
-
-- If moving across major releases e.g. v2.0.0 - v3.0.0 there are significant changes to the benchmarks and controls it is suggested to start as a new standard not to upgrade.
-
-- Containers references vars/is_container.yml this is an example and to be updated for your requirements
+- To use release version please point to main branch and relevant release for the cis benchmark you wish to work with.
 
 - Did we mention testing??
 
 ---
 
+## Coming From A Previous Release ⏪
+
+CIS release always contains changes, it is highly recommended to review the new references and available variables. This have changed significantly since ansible-lockdown initial release.
+This is now compatible with python3 if it is found to be the default interpreter. This does come with pre-requisites which it configures the system accordingly.
+
+Further details can be seen in the [Changelog](./ChangeLog.md)
+
+---
+
 ## Matching a security Level for CIS
 
-It is possible to to only run level 1 or level 2 controls for CIS.
+It is possible to only run level 1 or level 2 controls for CIS.
 This is managed using tags:
 
 - level1-server
@@ -68,16 +103,36 @@ This is managed using tags:
 - level2-server
 - level2-workstation
 
-The control found in defaults main also need to reflect this as this control the testing thet takes place if you are using the audit component.
+The control found in defaults main also need to reflect this as this control the testing that takes place if you are using the audit component.
 
-## Coming from a previous release
+---
+## Requirements ✅
 
-CIS release always contains changes, it is highly recommended to review the new references and available variables. This have changed significantly since ansible-lockdown initial release.
-This is now compatible with python3 if it is found to be the default interpreter. This does come with pre-requisites which it configures the system accordingly.
+**General:**
 
-Further details can be seen in the [Changelog](./Changelog.md)
+- Basic knowledge of Ansible, below are some links to the Ansible documentation to help get started if you are unfamiliar with Ansible
 
-## Auditing (new)
+  - [Main Ansible documentation page](https://docs.ansible.com)
+  - [Ansible Getting Started](https://docs.ansible.com/ansible/latest/user_guide/intro_getting_started.html)
+  - [Tower User Guide](https://docs.ansible.com/ansible-tower/latest/html/userguide/index.html)
+  - [Ansible Community Info](https://docs.ansible.com/ansible/latest/community/index.html)
+- Functioning Ansible and/or Tower Installed, configured, and running. This includes all of the base Ansible/Tower configurations, needed packages installed, and infrastructure setup.
+- Please read through the tasks in this role to gain an understanding of what each control is doing. Some of the tasks are disruptive and can have unintended consequences in a live production system. Also familiarize yourself with the variables in the defaults/main.yml file.
+
+**Technical Dependencies:**
+
+RHEL Family OS 9
+
+- Access to download or add the goss binary and content to the system if using auditing
+(other options are available on how to get the content to the system.)
+- Python3.8
+- Ansible 2.12+
+- python-def
+- libselinux-python
+
+---
+
+## Auditing 🔍
 
 This can be turned on or off within the defaults/main.yml file with the variable run_audit. The value is false by default, please refer to the wiki for more details. The defaults file also populates the goss checks to check only the controls that have been enabled in the ansible role.
 
@@ -108,7 +163,7 @@ PLAY RECAP *********************************************************************
 default                    : ok=270  changed=23   unreachable=0    failed=0    skipped=140  rescued=0    ignored=0
 ```
 
-## Documentation
+## Documentation 📖
 
 - [Read The Docs](https://ansible-lockdown.readthedocs.io/en/latest/)
 - [Getting Started](https://www.lockdownenterprise.com/docs/getting-started-with-lockdown#GH_AL_RH9_cis)
@@ -116,38 +171,32 @@ default                    : ok=270  changed=23   unreachable=0    failed=0    s
 - [Per-Host Configuration](https://www.lockdownenterprise.com/docs/per-host-lockdown-enterprise-configuration#GH_AL_RH9_cis)
 - [Getting the Most Out of the Role](https://www.lockdownenterprise.com/docs/get-the-most-out-of-lockdown-enterprise#GH_AL_RH9_cis)
 
-## Requirements
-
-**General:**
-
-- Basic knowledge of Ansible, below are some links to the Ansible documentation to help get started if you are unfamiliar with Ansible
-
-  - [Main Ansible documentation page](https://docs.ansible.com)
-  - [Ansible Getting Started](https://docs.ansible.com/ansible/latest/user_guide/intro_getting_started.html)
-  - [Tower User Guide](https://docs.ansible.com/ansible-tower/latest/html/userguide/index.html)
-  - [Ansible Community Info](https://docs.ansible.com/ansible/latest/community/index.html)
-- Functioning Ansible and/or Tower Installed, configured, and running. This includes all of the base Ansible/Tower configurations, needed packages installed, and infrastructure setup.
-- Please read through the tasks in this role to gain an understanding of what each control is doing. Some of the tasks are disruptive and can have unintended consequences in a live production system. Also familiarize yourself with the variables in the defaults/main.yml file.
-
-**Technical Dependencies:**
-
-RHEL/AlmaLinux/Rocky/Oracle 9 - Other versions are not supported.
-
-- Access to download or add the goss binary and content to the system if using auditing
-(other options are available on how to get the content to the system.)
-- Python3.8
-- Ansible 2.12+
-- python-def
-- libselinux-python
 
 ## Role Variables
 
 This role is designed that the end user should not have to edit the tasks themselves. All customizing should be done via the defaults/main.yml file or with extra vars within the project, job, workflow, etc.
 
-## Tags
+## Tags 🏷️
 
-There are many tags available for added control precision. Each control has it's own set of tags noting what level, if it's scored/notscored, what OS element it relates to, if it's a patch or audit, and the rule number.
+There are many tags available for added control precision. Each control has its own set of tags noting what level, what OS element it relates to, whether it's a patch or audit, and the rule number. Additionally, NIST references follow a specific conversion format for consistency and clarity.
 
+### Conversion Format for NIST References:
+
+  1. Standard Prefix:
+
+    - All references are prefixed with "NIST".
+
+  2. Standard Types:
+
+    - "800-53" references are formatted as NIST800-53.
+    - "800-53r5" references are formatted as NIST800-53R5 (with 'R' capitalized).
+    - "800-171" references are formatted as NIST800-171.
+
+  3. Details:
+
+    - Section and subsection numbers use periods (.) for numeric separators.
+    - Parenthetical elements are separated by underscores (_), e.g., IA-5(1)(d) becomes IA-5_1_d.
+    - Subsection letters (e.g., "b") are appended with an underscore.
 Below is an example of the tag section from a control within this role. Using this example if you set your run to skip all controls with the tag services, this task will be skipped. The opposite can also happen where you run only controls tagged with services.
 
 ```sh
@@ -161,33 +210,34 @@ Below is an example of the tag section from a control within this role. Using th
       - rule_2.2.4
 ```
 
-## Community Contribution
+
+## Community Contribution 🧑‍🤝‍🧑
 
 We encourage you (the community) to contribute to this role. Please read the rules below.
 
-- Your work is done in your own individual branch. Make sure to Signed-off and GPG sign all commits you intend to merge.
+- Your work is done in your own individual branch. Make sure to Signed-off-by and GPG sign all commits you intend to merge.
 - All community Pull Requests are pulled into the devel branch
-- Pull Requests into devel will confirm your commits have a GPG signature, Signed-off, and a functional test before being approved
+- Pull Requests into devel will confirm your commits have a GPG signature, Signed-off-by, and a functional test before being approved
 - Once your changes are merged and a more detailed review is complete, an authorized member will merge your changes into the main branch for a new release
 
+## Pipeline Testing 🔄
+
+uses:
+
+- ansible-core 2.16
+- ansible collections - pulls in the latest version based on requirements file
+- runs the audit using the devel branch
+- This is an automated test that occurs on pull requests into devel
+- self-hosted runners using OpenTofu
+
 ## Known Issues
 
 Almalinux BaseOS, EPEL and many cloud providers repositories, do not allow gpgcheck(rule_1.2.1.2) or repo_gpgcheck (rule_1.2.1.3) this will cause issues during the playbook unless or a workaround is found.
 
-## Pipeline Testing
 
-uses:
+## Local Testing 💻
 
-- ansible-core 2.12
-- ansible collections - pulls in the latest version based on requirements file
-- runs the audit using the devel branch
-- This is an automated test that occurs on pull requests into devel
-
-## Local Testing
-
-Molecule can be used to work on this role and test in distinct _scenarios_.
-
-### examples
+### example
 
 ```bash
 molecule test -s default
@@ -197,24 +247,15 @@ molecule verify -s localhost
 
 local testing uses:
 
-- ansible 2.13.3
+- ansible-core
 - molecule 4.0.1
 - molecule-docker 2.0.0
 - molecule-podman 2.0.2
 - molecule-vagrant 1.0.0
 - molecule-azure 0.5.0
 
-## Added Extras
 
-- [pre-commit](https://pre-commit.com) can be tested and can be run from within the directory
-
-```sh
-pre-commit run
-```
-
-## Credits and Thanks
-
-Based on an original concept by Sam Doran
+## Credits and Thanks 🙏
 
 Massive thanks to the fantastic community and all its members.
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 3f6202b..f620a72 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # defaults file for rhel9-cis
 # WARNING:
-# These values may be overriden by other vars-setting options(e.g. like the below 'container_vars_file'), as explained here:
+# These values may be overridden by other vars-setting options(e.g. like the below 'container_vars_file'), as explained here:
 # https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable
 
 # Run the OS validation check
@@ -11,18 +11,24 @@ os_check: true
 # Disruption is high
 ## Run tests that are considered higher risk and could have a system impact if not properly tested
 ## Default false
-## Will be fine if clean new unconfigured build
-rhel9cis_disruption_high: false
+## Will be fine if clean new un-configured build
+rhel9cis_disruption_high: true
 
 ## Switching on/off specific baseline sections
 # These variables govern whether the tasks of a particular section are to be executed when running the role.
 # E.g: If you want to execute the tasks of Section 1 you should set the "_section1" variable to true.
 # If you do not want the tasks from that section to get executed you simply set the variable to "false".
+# Some sections support sub-section modularization. The super-section and sub-section must both be true
+# for the sub-section to execute.
 rhel9cis_section1: true
 rhel9cis_section2: true
 rhel9cis_section3: true
 rhel9cis_section4: true
 rhel9cis_section5: true
+rhel9cis_section5_1: true
+rhel9cis_section5_2: true
+rhel9cis_section5_3: true
+rhel9cis_section5_4: true
 rhel9cis_section6: true
 rhel9cis_section7: true
 
@@ -33,6 +39,11 @@ rhel9cis_section7: true
 rhel9cis_level_1: true
 rhel9cis_level_2: true
 
+# Create managed not custom local_facts files
+create_benchmark_facts: true
+# The path where the ansible facts file is created if audit facts are not present
+ansible_facts_path: /etc/ansible/facts.d
+
 ## Section 1.6 - Mandatory Access Control
 # This variable governs whether SELinux is disabled or not. If SELinux is NOT DISABLED by setting
 # 'rhel9cis_selinux_disable' to 'true', the 1.6 subsection will be executed.
@@ -41,7 +52,7 @@ rhel9cis_selinux_disable: false
 # UEFI boot('/etc/grub2-efi.cfg') or in case of BIOS legacy-boot('/etc/grub2.cfg').
 rhel9cis_legacy_boot: false
 
-## Benchmark name used by audting control role
+## Benchmark name used by auditing control role
 # The audit variable found at the base
 ## metadata for Audit benchmark
 benchmark_version: 'v2.0.0'
@@ -63,26 +74,36 @@ change_requires_reboot: false
 ### Goss is required on the remote host ###
 ### vars/auditd.yml for other settings  ###
 
-# Allow audit to setup the requirements including installing git (if option chosen and downloading and adding goss binary to system)
+## Audit setup
+# Audits are carried out using Goss. This variable
+# determines whether execution of the role prepares for auditing
+# by installing the required binary.
 setup_audit: false
 
-# enable audits to run - this runs the audit and get the latest content
+## Enable audits to run - this runs the audit and get the latest content
+# This variable governs whether the audit using the
+# separately maintained audit role using Goss
+# is carried out.
+# This runs the audit and gets the latest content
 run_audit: false
 # Run heavy tests - some tests can have more impact on a system enabling these can have greater impact on a system
 audit_run_heavy_tests: true
+# Ability to limit the number of concurrent processes used by goss (default 50)
+audit_max_concurrent: 50
 
 ## Only run Audit do not remediate
 audit_only: false
 ### As part of audit_only ###
-# This will enable files to be copied back to control node in audit_only mode
-fetch_audit_files: false
 # Path to copy the files to will create dir structure in audit_only mode
 audit_capture_files_dir: /some/location to copy to on control node
 #############################
 
-# How to retrieve audit binary
-# Options are copy or download - detailed settings at the bottom of this file
-# you will need to access to either github or the file already dowmloaded
+## How to retrieve audit binary(Goss)
+# Options are 'copy' or 'download' - detailed settings at the bottom of this file
+# - if 'copy':
+#    - the filepath mentioned via the below 'audit_bin_copy_location' var will be used to access already downloaded Goss
+# - if 'download':
+#    - the GitHub Goss-releases URL will be used for a fresh-download, via 'audit_bin_url' and 'audit_pkg_arch_name' vars
 get_audit_binary_method: download
 
 ## if get_audit_binary_method - copy the following needs to be updated for your environment
@@ -90,14 +111,22 @@ get_audit_binary_method: download
 ## e.g copy from ansible control node to remote host
 audit_bin_copy_location: /some/accessible/path
 
-# how to get audit files onto host options
+## How to retrieve the audit role
+# The role for auditing is maintained separately.
+# This variable specifies the method of how to get the audit role
 # options are git/copy/archive/get_url other e.g. if you wish to run from already downloaded conf
+# onto the system. The options are as follows:
+# - 'git': clone audit content from GitHub REPOSITORY, set up via `audit_file_git` var, and
+#          VERSION(e.g. branch, tag name), set up via `audit_git_version` var.
+# - 'copy': copy from path as specified in variable `audit_conf_copy`.
+# - 'archive': same as 'copy', only that the specified filepath needs to be unpacked.
+# - 'get_url': Download from url as specified in variable `audit_files_url`
 audit_content: git
 
 # If using either archive, copy, get_url:
 ## Note will work with .tar files - zip will require extra configuration
 ### If using get_url this is expecting github url in tar.gz format e.g.
-### https://github.com/ansible-lockdown/UBUNTU22-CIS-Audit/archive/refs/heads/benchmark-v1.0.0.tar.gz
+### https://github.com/ansible-lockdown/RHEL9-CIS-Audit/archive/refs/heads/benchmark-v1.0.0.tar.gz
 audit_conf_source: "some path or url to copy from"
 
 # Destination for the audit content to be placed on managed node
@@ -107,6 +136,20 @@ audit_conf_dest: "/opt"
 # Where the audit logs are stored
 audit_log_dir: '/opt'
 
+## Ability to collect and take audit files moving to a centralized location
+# This enables the collection of the files from the host
+fetch_audit_output: false
+
+# Method of getting,uploading the summary files
+## Ensure access and permissions are available for these to occur.
+## options are
+# fetch - fetches from server and moves to location on the ansible controller (could be a mount point available to controller)
+# copy - copies file to a location available to the managed node
+audit_output_collection_method: fetch
+
+# Location to put the audit files
+audit_output_destination: /opt/audit_summaries/
+
 ### Goss Settings ##
 ####### END ########
 
@@ -115,6 +158,7 @@ audit_log_dir: '/opt'
 # PLEASE NOTE: These work in coordination with the section # group variables and tags.
 # You must enable an entire section in order for the variables below to take effect.
 
+## Section 1 Fixes
 # Section 1 is Initial setup (FileSystem Configuration, Configure Software Updates, Filesystem Integrity Checking, Secure Boot Settings,
 # Additional Process Hardening, Mandatory Access Control, Command Line Warning Banners, and GNOME Display Manager)
 # Filesystem kernel modules
@@ -161,7 +205,6 @@ rhel9cis_rule_1_1_2_7_1: true
 rhel9cis_rule_1_1_2_7_2: true
 rhel9cis_rule_1_1_2_7_3: true
 rhel9cis_rule_1_1_2_7_4: true
-
 # Package Mgmt
 # Config Pkg Repos
 rhel9cis_rule_1_2_1_1: true
@@ -170,7 +213,6 @@ rhel9cis_rule_1_2_1_3: true
 rhel9cis_rule_1_2_1_4: true
 # Package updates
 rhel9cis_rule_1_2_2_1: true
-
 # Selinux
 rhel9cis_rule_1_3_1_1: true
 rhel9cis_rule_1_3_1_2: true
@@ -180,17 +222,14 @@ rhel9cis_rule_1_3_1_5: true
 rhel9cis_rule_1_3_1_6: true
 rhel9cis_rule_1_3_1_7: true
 rhel9cis_rule_1_3_1_8: true
-
 # Bootloader
 rhel9cis_rule_1_4_1: true
 rhel9cis_rule_1_4_2: true
-
 # Additional Process Hardening
 rhel9cis_rule_1_5_1: true
 rhel9cis_rule_1_5_2: true
 rhel9cis_rule_1_5_3: true
 rhel9cis_rule_1_5_4: true
-
 # Config system wide Crypto
 rhel9cis_rule_1_6_1: true
 rhel9cis_rule_1_6_2: true
@@ -199,7 +238,6 @@ rhel9cis_rule_1_6_4: true
 rhel9cis_rule_1_6_5: true
 rhel9cis_rule_1_6_6: true
 rhel9cis_rule_1_6_7: true
-
 # Command line warning banners
 rhel9cis_rule_1_7_1: true
 rhel9cis_rule_1_7_2: true
@@ -207,7 +245,6 @@ rhel9cis_rule_1_7_3: true
 rhel9cis_rule_1_7_4: true
 rhel9cis_rule_1_7_5: true
 rhel9cis_rule_1_7_6: true
-
 # Gnome Display Manager
 rhel9cis_rule_1_8_1: true
 rhel9cis_rule_1_8_2: true
@@ -220,8 +257,9 @@ rhel9cis_rule_1_8_8: true
 rhel9cis_rule_1_8_9: true
 rhel9cis_rule_1_8_10: true
 
-# Section 2 rules are controling Services (Special Purpose Services, and service clients)
-## Configure Server Services
+## Section 2 Fixes
+# Section 2 rules are controlling Services (Special Purpose Services, and service clients)
+# Configure Server Services
 rhel9cis_rule_2_1_1: true
 rhel9cis_rule_2_1_2: true
 rhel9cis_rule_2_1_3: true
@@ -244,21 +282,18 @@ rhel9cis_rule_2_1_19: true
 rhel9cis_rule_2_1_20: true
 rhel9cis_rule_2_1_21: true
 rhel9cis_rule_2_1_22: true
-
-## Configure Client Services
+# Configure Client Services
 rhel9cis_rule_2_2_1: true
 rhel9cis_rule_2_2_2: true
 rhel9cis_rule_2_2_3: true
 rhel9cis_rule_2_2_4: true
 rhel9cis_rule_2_2_5: true
-
-## Configure Time Synchronization
+# Configure Time Synchronization
 rhel9cis_rule_2_3_1: true
 rhel9cis_rule_2_3_2: true
 rhel9cis_rule_2_3_3: true
-
-## Job Schedulers
-### cron
+# Job Schedulers
+# cron
 rhel9cis_rule_2_4_1_1: true
 rhel9cis_rule_2_4_1_2: true
 rhel9cis_rule_2_4_1_3: true
@@ -267,15 +302,16 @@ rhel9cis_rule_2_4_1_5: true
 rhel9cis_rule_2_4_1_6: true
 rhel9cis_rule_2_4_1_7: true
 rhel9cis_rule_2_4_1_8: true
-### at
+# at
 rhel9cis_rule_2_4_2_1: true
 
-# Section 3 Network
-## Network Devices
+## Section 3 Fixes
+# Section 3 rules are used for securely configuring the network configuration(kernel params, ACL, Firewall settings)
+# Network Devices
 rhel9cis_rule_3_1_1: true
 rhel9cis_rule_3_1_2: true
 rhel9cis_rule_3_1_3: true
-## Network Kernel Modules
+# Network Kernel Modules
 rhel9cis_rule_3_2_1: true
 rhel9cis_rule_3_2_2: true
 rhel9cis_rule_3_2_3: true
@@ -293,11 +329,13 @@ rhel9cis_rule_3_3_9: true
 rhel9cis_rule_3_3_10: true
 rhel9cis_rule_3_3_11: true
 
-# Section 4 Firewalls
-## Firewall utility
+## Section 4 Fixes
+# Section 4 rules are Logging and Auditing (Configure System Accounting (auditd),
+# Configure Data Retention, and Configure Logging)
+# Firewall utility
 rhel9cis_rule_4_1_1: true
 rhel9cis_rule_4_1_2: true
-## Configure firewalld
+# Configure firewalld
 rhel9cis_rule_4_2_1: true
 rhel9cis_rule_4_2_2: true
 # Configure nftables
@@ -306,8 +344,10 @@ rhel9cis_rule_4_3_2: true
 rhel9cis_rule_4_3_3: true
 rhel9cis_rule_4_3_4: true
 
-## Section 5
-## 5.1. Configure SSH Server
+## Section 5 Fixes
+# Section 5 rules control Access, Authentication, and Authorization (Configure time-based job schedulers,
+# Configure sudo, Configure SSH Server, Configure PAM and User Accounts and Environment)
+# Configure SSH Server
 rhel9cis_rule_5_1_1: true
 rhel9cis_rule_5_1_2: true
 rhel9cis_rule_5_1_3: true
@@ -330,7 +370,7 @@ rhel9cis_rule_5_1_19: true
 rhel9cis_rule_5_1_20: true
 rhel9cis_rule_5_1_21: true
 rhel9cis_rule_5_1_22: true
-## 5.2 Configure Privilege Escalation
+# 5.2 Configure Privilege Escalation
 rhel9cis_rule_5_2_1: true
 rhel9cis_rule_5_2_2: true
 rhel9cis_rule_5_2_3: true
@@ -362,7 +402,7 @@ rhel9cis_rule_5_3_3_2_6: true
 rhel9cis_rule_5_3_3_2_7: true
 rhel9cis_rule_5_3_3_2_8: true
 # 5.3.3.3 Configure pam_pwhistory module
-# This are added as part of 5.3.2.4 using jinja2 template
+# These are added as part of 5.3.2.4 using jinja2 template
 rhel9cis_rule_5_3_3_3_1: true
 rhel9cis_rule_5_3_3_3_2: true
 rhel9cis_rule_5_3_3_3_3: true
@@ -393,17 +433,18 @@ rhel9cis_rule_5_4_3_1: true
 rhel9cis_rule_5_4_3_2: true
 rhel9cis_rule_5_4_3_3: true
 
-# Section 6 Logging and Auditing
-## 6.1 Configure Integrity Checking
+## Section 6 Fixes
+# Section 6 rules control Logging and Auditing
+# Configure Integrity Checking
 rhel9cis_rule_6_1_1: true
 rhel9cis_rule_6_1_2: true
 rhel9cis_rule_6_1_3: true
-## 6.2.1 Configure systemd-journald service
+# 6.2.1 Configure systemd-journald service
 rhel9cis_rule_6_2_1_1: true
 rhel9cis_rule_6_2_1_2: true
 rhel9cis_rule_6_2_1_3: true
 rhel9cis_rule_6_2_1_4: true
-## 6.2.2.x Configure journald
+# 6.2.2.x Configure journald
 rhel9cis_rule_6_2_2_1_1: true
 rhel9cis_rule_6_2_2_1_2: true
 rhel9cis_rule_6_2_2_1_3: true
@@ -411,7 +452,7 @@ rhel9cis_rule_6_2_2_1_4: true
 rhel9cis_rule_6_2_2_2: true
 rhel9cis_rule_6_2_2_3: true
 rhel9cis_rule_6_2_2_4: true
-## 6.2.3 Configure rsyslog
+# 6.2.3 Configure rsyslog
 rhel9cis_rule_6_2_3_1: true
 rhel9cis_rule_6_2_3_2: true
 rhel9cis_rule_6_2_3_3: true
@@ -420,20 +461,20 @@ rhel9cis_rule_6_2_3_5: true
 rhel9cis_rule_6_2_3_6: true
 rhel9cis_rule_6_2_3_7: true
 rhel9cis_rule_6_2_3_8: true
-## 6.2.4 Configure Logfiles
+# 6.2.4 Configure Logfiles
 rhel9cis_rule_6_2_4_1: true
-## 6.3 Configure Auditing
-## 6.3.1 Configure auditd Service
+# 6.3 Configure Auditing
+# 6.3.1 Configure auditd Service
 rhel9cis_rule_6_3_1_1: true
 rhel9cis_rule_6_3_1_2: true
 rhel9cis_rule_6_3_1_3: true
 rhel9cis_rule_6_3_1_4: true
-## 6.3.2 Configure Data Retention
+# 6.3.2 Configure Data Retention
 rhel9cis_rule_6_3_2_1: true
 rhel9cis_rule_6_3_2_2: true
 rhel9cis_rule_6_3_2_3: true
 rhel9cis_rule_6_3_2_4: true
-## 6.3.3 Configure auditd Rules
+# 6.3.3 Configure auditd Rules
 rhel9cis_rule_6_3_3_1: true
 rhel9cis_rule_6_3_3_2: true
 rhel9cis_rule_6_3_3_3: true
@@ -455,7 +496,7 @@ rhel9cis_rule_6_3_3_18: true
 rhel9cis_rule_6_3_3_19: true
 rhel9cis_rule_6_3_3_20: true
 rhel9cis_rule_6_3_3_21: true
-## 6.3.4 Configure auditd File Access
+# 6.3.4 Configure auditd File Access
 rhel9cis_rule_6_3_4_1: true
 rhel9cis_rule_6_3_4_2: true
 rhel9cis_rule_6_3_4_3: true
@@ -467,8 +508,9 @@ rhel9cis_rule_6_3_4_8: true
 rhel9cis_rule_6_3_4_9: true
 rhel9cis_rule_6_3_4_10: true
 
-# Section 7 System Maintenance
-## 7.1 System File Permissions
+## Section 7 Fixes
+# Section 7 rules control System Maintenance
+# System File Permissions
 rhel9cis_rule_7_1_1: true
 rhel9cis_rule_7_1_2: true
 rhel9cis_rule_7_1_3: true
@@ -482,7 +524,7 @@ rhel9cis_rule_7_1_10: true
 rhel9cis_rule_7_1_11: true
 rhel9cis_rule_7_1_12: true
 rhel9cis_rule_7_1_13: true
-## 7.2 Local User and Group Settings
+# 7.2 Local User and Group Settings
 rhel9cis_rule_7_2_1: true
 rhel9cis_rule_7_2_2: true
 rhel9cis_rule_7_2_3: true
@@ -495,7 +537,7 @@ rhel9cis_rule_7_2_9: true
 
 ## Section 1 vars
 
-## Ability to enabe debug on mounts to assist in troubleshooting
+## Ability to enable debug on mounts to assist in troubleshooting
 # Mount point changes are set based upon facts created in Prelim
 # these then build the variable and options that is passed to the handler to set the mount point for the controls in section1.
 rhel9cis_debug_mount_data: false
@@ -511,12 +553,12 @@ rhel9cis_tmp_svc: false
 # Setting to `true` will allow a test on the package and force the import of the key
 rhel9cis_force_gpg_key_import: true
 
-## Control 1.2.4
+## Control 1.2.1.3
 # When installing RHEL from authorized Red Hat source, RHEL will come with default YUM repository. NOT having a default YUM
 # repo ('rhel9cis_rhel_default_repo' set as 'false'), in conjunction with 'rhel9cis_rule_enable_repogpg' set as 'True', will enable the tasks
 # which check the GPG signatures for all the individual YUM repositories.
 rhel9cis_rhel_default_repo: true
-## Control 1.2.4
+## Control 1.2.1.3
 # When 'rhel9cis_rule_enable_repogpg' is set to 'true'(in conjunction with 'rhel9cis_rhel_default_repo':'false'), conditions are met for
 # enabling the GPG signatures-check for all the individual YUM repositories. If GPG signatures-check is enabled on repositories which do not
 # support it(like RedHat), installation of packages will fail.
@@ -528,7 +570,7 @@ rhel9cis_rule_enable_repogpg: true
 # and may prevent some services from running. Requires SELinux not being disabled (by
 # having 'rhel9cis_selinux_disable' var set as 'true'), otherwise setting will be ignored.
 rhel9cis_selinux_pol: targeted
-## Control 1.6.1.3|4 - SELinux configured and not disabled
+## Control 1.3.1.3|4|5 - SELinux policy settings
 # This variable contains a specific SELinux mode, respectively:
 #  - 'enforcing':  SELinux policy IS enforced, therefore denies operations based on SELinux policy
 # rules. If system was installed with SELinux, this is enabled by default.
@@ -550,7 +592,9 @@ rhel9cis_bootloader_password_hash: 'grub.pbkdf2.sha512.changethispassword'  # pr
 # This variable governs whether a bootloader password should be set in '/boot/grub2/user.cfg' file.
 rhel9cis_set_boot_pass: true
 
-## Control 1.6
+## Controls 1.6.x and Controls 5.1.x
+# This variable governs if current Ansible role should manage system-wide crypto policy.
+rhel9cis_crypto_policy_ansiblemanaged: true
 # This variable contains the value to be set as the system-wide crypto policy. Current rule enforces NOT USING
 # 'LEGACY' value(as it is less secure, it just ensures compatibility with legacy systems), therefore
 # possible values for this variable are, as explained by RedHat docs:
@@ -558,22 +602,36 @@ rhel9cis_set_boot_pass: true
 #  -'FUTURE': conservative security level that is believed to withstand any near-term future attacks
 #  -'FIPS': A level that conforms to the FIPS140-2 requirements
 rhel9cis_crypto_policy: 'DEFAULT'
-## Control 1.6
 # This variable contains the value of the crypto policy module(combinations of policies and
 # sub-policies) to be allowed as default setting. Allowed options are defined in 'vars/main.yml' file,
-# using 'rhel9cis_allowed_crypto_policies_modules' variable.
+# using 'rhel9cis_allowed_crypto_policies_modules' variable, which currently are:
+#    - 'OSPP'
+#    - 'AD-SUPPORT'
+#    - 'AD-SUPPORT-LEGACY'
 rhel9cis_crypto_policy_module: ''
+## Controls 1.6.x
+# This variable contains the value of the crypto policy module(combinations of policies and
+# sub-policies) to be allowed as default setting. Allowed options are defined in 'vars/main.yml' file,
+# using those listed in the 'rhel9cis_allowed_crypto_policies_modules' variable.
+rhel9cis_additional_crypto_policy_module: ''
 
 ## Controls:
 # - 1.7.1 - Ensure message of the day is configured properly
 # - 1.7.2 - Ensure local login warning banner is configured properly
 # - 1.7.3 - Ensure remote login warning banner is configured properly
 # This variable  stores the content for the Warning Banner(relevant for issue, issue.net, motd).
-rhel9cis_warning_banner: Authorized uses only. All activity may be monitored and reported.
+rhel9cis_warning_banner: Authorized users only. All activity may be monitored and reported.
 # End Banner
 
 ## Control 1.8.x - Settings for GDM
-## 1.8 GDM graphical interface
+# do not run Control 1.8.x if using a display manager different than gdm
+rhel9cis_display_manager: "gdm"
+# This variable governs whether rules dealing with GUI specific packages(and/or their settings) should
+# be executed either to:
+# - secure GDM, if GUI is needed('rhel9cis_gui: true')
+# - or remove GDM and X-Windows-system, if no GUI is needed('rhel9cis_gui: false')
+# The value of this variable is set automatically, if gnome is present this variable
+# will always have `true` as a value, and `false` otherwise.
 rhel9cis_gui: "{{ prelim_gnome_present.stat.exists | default(false) }}"
 # This variable specifies the GNOME configuration database file to which configurations are written.
 # (See "https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en")
@@ -621,138 +679,195 @@ rhel9cis_chrony_server_makestep: "1.0 3"
 # improve the reliability, because multiple sources will need to correspond with each other.
 rhel9cis_chrony_server_minsources: 2
 
-# Service configuration
-# Options are
-# Service
-# - false - removes package
-# - true - leaves package installed
-# Mask
-# - false - leaves service in current status
-# - true - sets service name to masked
-#
-# Setting both Service and Mask to false will remove the package if exists
+###
+### The set of rules that make up section 2.1, are used for ensuring that
+### certain services are not installed on the OS.
+### The following list of variables contain two types: the ones that end in '_services', and the ones that end in '_mask'
+### in '_mask'. For completely removing a service both those variables referencing that service shall be set to 'false'.
+### For masking a service the type that ends in '_mask' shall be set to 'true'.
+### Set this variable to `true` to keep service `autofs`; otherwise, the service is uninstalled.
+###
+
+###########################################
+
+## Controls 2.1.x - Configure Server Services
+# Set this variable to `true` to keep service `autofs`; otherwise, the service is uninstalled.
 rhel9cis_autofs_services: false
+# Set this variable to `true` to mask service `autofs`.
 rhel9cis_autofs_mask: false
+# Set this variable to `true` to keep service `avahi`; otherwise, the service is uninstalled.
 rhel9cis_avahi_server: false
+# Set this variable to `true` to mask service `avahi`.
 rhel9cis_avahi_mask: false
+# Set this variable to `true` to keep service `dhcp`; otherwise, the service is uninstalled.
 rhel9cis_dhcp_server: false
+# Set this variable to `true` to mask service `dhcp`.
 rhel9cis_dhcp_mask: false
+# Set this variable to `true` to keep service `dns`; otherwise, the service is uninstalled.
 rhel9cis_dns_server: false
+# Set this variable to `true` to mask service `dns`.
 rhel9cis_dns_mask: false
+# Set this variable to `true` to keep service `dnsmasq`; otherwise, the service is uninstalled.
 rhel9cis_dnsmasq_server: false
+# Set this variable to `true` to mask service `dnsmasq`.
 rhel9cis_dnsmasq_mask: false
+# Set this variable to `true` to keep service `samba`; otherwise, the service is uninstalled.
 rhel9cis_samba_server: false
+# Set this variable to `true` to mask service `samba`.
 rhel9cis_samba_mask: false
+# Set this variable to `true` to keep service `ftp`; otherwise, the service is uninstalled.
 rhel9cis_ftp_server: false
+# Set this variable to `true` to mask service `ftp`.
 rhel9cis_ftp_mask: false
+# Set this variable to `true` to keep service `message`; otherwise, the service is uninstalled.
 rhel9cis_message_server: false  # This is for messaging dovecot and cyrus-imap
+# Set this variable to `true` to mask service `message`.
 rhel9cis_message_mask: false
+# Set this variable to `true` to keep service `nfs`; otherwise, the service is uninstalled.
 rhel9cis_nfs_server: true
+# Set this variable to `true` to mask service `nfs`.
 rhel9cis_nfs_mask: true
+# Set this variable to `true` to keep service `nis`; otherwise, the service is uninstalled.
 rhel9cis_nis_server: true  # set to mask if nis client required
+# Set this variable to `true` to mask service `nis`.
 rhel9cis_nis_mask: false
+# Set this variable to `true` to keep service `print`; otherwise, the service is uninstalled.
 rhel9cis_print_server: false  # replaces cups
+# Set this variable to `true` to mask service `print`.
 rhel9cis_print_mask: false
+# Set this variable to `true` to keep service `rpc`; otherwise, the service is uninstalled.
 rhel9cis_rpc_server: true
+# Set this variable to `true` to mask service `rpc`.
 rhel9cis_rpc_mask: true
+# Set this variable to `true` to keep service `rsync`; otherwise, the service is uninstalled.
 rhel9cis_rsync_server: false
+# Set this variable to `true` to mask service `rsync`.
 rhel9cis_rsync_mask: false
+# Set this variable to `true` to keep service `snmp`; otherwise, the service is uninstalled.
 rhel9cis_snmp_server: false
+# Set this variable to `true` to mask service `snmp`.
 rhel9cis_snmp_mask: false
+# Set this variable to `true` to keep service `telnet`; otherwise, the service is uninstalled.
 rhel9cis_telnet_server: false
+# Set this variable to `true` to mask service `telnet`.
 rhel9cis_telnet_mask: false
+# Set this variable to `true` to keep service `tftp`; otherwise, the service is uninstalled.
 rhel9cis_tftp_server: false
+# Set this variable to `true` to mask service `tftp`.
 rhel9cis_tftp_mask: false
+# Set this variable to `true` to keep service `squid`; otherwise, the service is uninstalled.
 rhel9cis_squid_server: false
+# Set this variable to `true` to mask service `squid`.
 rhel9cis_squid_mask: false
+# Set this variable to `true` to keep service `httpd`; otherwise, the service is uninstalled.
 rhel9cis_httpd_server: false
+# Set this variable to `true` to mask service `httpd`.
 rhel9cis_httpd_mask: false
+# Set this variable to `true` to keep service `nginx`; otherwise, the service is uninstalled.
 rhel9cis_nginx_server: false
+# Set this variable to `true` to mask service `nginx`.
 rhel9cis_nginx_mask: false
+# Set this variable to `true` to keep service `xinetd`; otherwise, the service is uninstalled.
 rhel9cis_xinetd_server: false
+# Set this variable to `true` to mask service `xinetd`.
 rhel9cis_xinetd_mask: false
+# Set this variable to `true` to keep service `xwindow`; otherwise, the service is uninstalled.
 rhel9cis_xwindow_server: false  # will remove mask not an option
+
+## Control 2.1.21 - Ensure mail transfer agent is configured for local-only mode
+# This variable if set to 'false', ensures that the mail transfer agent is configured for
+# local-only mode.
 rhel9cis_is_mail_server: false
 
-## Section 2.3 Service clients
+## Section 2.2 Service clients
 
+## Control - 2.2.1 - Ensure FTP client is not installed
+# Set this variable to `true` to keep package `ftp`; otherwise, the package is uninstalled.
 rhel9cis_ftp_client: false
+## Control - 2.2.2 - Ensure LDAP client is not installed
+# Set this variable to `true` to keep package `openldap-clients`; otherwise, the package is uninstalled.
 rhel9cis_openldap_clients_required: false
-rhel9cis_ypbind_required: false  # Same package as NIS server
+## Control - 2.2.3 - Ensure nis client is not installed
+# Set this variable to `true` to keep package `nis`(`ypbind`); otherwise, the package is uninstalled.
+rhel9cis_ypbind_required: false
+## Control - 2.2.4 - Ensure telnet client is not installed
+# Set this variable to `true` to keep package `telnet`; otherwise, the package is uninstalled.
 rhel9cis_telnet_required: false
+## Control - 2.2.5 - Ensure tftp client is not installed
+# Set this variable to `true` to keep package `tftp`; otherwise, the package is uninstalled.
 rhel9cis_tftp_client: false
 
 ## Section 3 vars
-## Sysctl
-# Service configuration
-# Options are
-# Service
-# - false - removes package
-# - true - leaves package installed
-# Mask
-# - false - leaves service in current status
-# - true - sets service name to masked
-#
-# Setting both Service and Mask to false will remove the package if exists
-#
-rhel9cis_bluetooth_service: false
-rhel9cis_bluetooth_mask: false
 
-## 3.1 IPv6 requirement toggle
+## Control 3.1.1 - Ensure IPv6 status is identified
 # This variable governs whether ipv6 is enabled or disabled.
 rhel9cis_ipv6_required: true
+# rhel9cis_ipv6_disable defines the method of disabling IPv6, sysctl vs kernel
+rhel9cis_ipv6_disable_method: "sysctl"
 
-## 3.1.2 wireless network requirements
-# if wireless adapetr found allow network manager to be installed
+## Control 3.1.2 - Ensure wireless interfaces are disabled
+# if wireless adapter found allow network manager to be installed
 rhel9cis_install_network_manager: false
-# 3.3 System network parameters (host only OR host and router)
+# This variable holds the name of the network manager package, and it is used
+# as a conditional to implement control 3.1.2. If the network manager package
+# is present on the system then the control will be implemented!
+rhel9cis_network_manager_package_name: NetworkManager
+
+## Control 3.1.3 - Ensure bluetooth services are not in use
+# Set this variable to `true` to keep service `bluetooth`; otherwise, the service is uninstalled.
+rhel9cis_bluetooth_service: false
+# Set this variable to `true` to mask service `bluetooth`.
+rhel9cis_bluetooth_mask: false
+
+## Controls 3.3.x System network parameters (host only OR host and router)
 # This variable governs whether specific CIS rules
 # concerned with acceptance and routing of packages are skipped.
 rhel9cis_is_router: false
 
 # This variable governs if the task which updates sysctl(including sysctl reload) is executed.
-# NOTE: The current default value is likely to be overriden by other further tasks(via 'set_fact').
+# NOTE: The current default value is likely to be overridden by other further tasks(via 'set_fact').
 rhel9cis_sysctl_update: false
 # This variable governs if the task which flushes the IPv4 routing table is executed(forcing subsequent connections to
 # use the new configuration).
-# NOTE: The current default value is likely to be overriden by other further tasks(via 'set_fact').
+# NOTE: The current default value is likely to be overridden by other further tasks(via 'set_fact').
 rhel9cis_flush_ipv4_route: false
 # This variable governs if the task which flushes the IPv6 routing table is executed(forcing subsequent connections to
 # use the new configuration).
-# NOTE: The current default value is likely to be overriden by other further tasks(via 'set_fact').
+# NOTE: The current default value is likely to be overridden by other further tasks(via 'set_fact').
 rhel9cis_flush_ipv6_route: false
 
-# Section 4 vars
+## Section 4 vars
+
 ### Firewall Service to install and configure - Options are:
 # 1) either 'firewalld'
 # 2) or 'nftables'
 #### Some control allow for services to be removed or masked
-#### The options are under each heading
+#### The options are under each heading:
 #### absent = remove the package
 #### masked = leave package if installed and mask the service
 rhel9cis_firewall: firewalld
 
-## Control 4.2.x - Ensure firewalld default zone is set
+## Control 4.2.2 - Ensure firewalld loopback traffic is configured
 # This variable will set the firewalld default zone(that is used for everything that is not explicitly bound/assigned
 # to another zone): if there is no zone assigned to a connection, interface or source, only the default zone is used.
 rhel9cis_default_zone: public
 
-## Controls 4.3.x nftables
-
-## 4.3.1 Ensure nftables base chains exist
-# This variable governs if a nftables base chain(entry point for packets from the networking stack) will be automatically
-# created, if needed. Without a chain, a hook for input, forward, and delete, packets that would flow through those
-# chains will not be touched by nftables.
-rhel9cis_nft_tables_autochaincreate: true
-
-## 4.3.2 Create tables if required
+## Controls 4.3.x
+# This variable governs if a table will be automatically created in nftables. Without a table (no default one), nftables
+# will not filter network traffic, so if this variable is set to 'false' and no tables exist, an alarm will be triggered!
 rhel9cis_nft_tables_autonewtable: true
 # This variable stores the name of the table to be used when configuring nftables(creating chains, configuring loopback
 # traffic, established connections, default deny). If 'rhel9cis_nft_tables_autonewtable' is set as true, a new table will
 # be created using as name the value stored by this variable.
 rhel9cis_nft_tables_tablename: filter
 
-## Section5 vars
+## Control 4.3.1 - Ensure nftables base chains exist
+# This variable governs if a nftables base chain(entry point for packets from the networking stack) will be automatically
+# created, if needed. Without a chain, a hook for input, forward, and delete, packets that would flow through those
+# chains will not be touched by nftables.
+rhel9cis_nft_tables_autochaincreate: true
+
+## Section 5 vars
 
 ## Section 5.1 - SSH
 
@@ -761,32 +876,30 @@ rhel9cis_nft_tables_tablename: filter
 # Otherwise, the default value is '/etc/ssh/ssh_config'.
 rhel9cis_sshd_config_file: /etc/ssh/sshd_config
 
-## Controls:
-## - 5.1.7  - Ensure SSH access is limited
+## Control 5.1.7 - Ensure sshd access is configured
 # This variable, if specified, configures a list of USER name patterns, separated by spaces, to allow SSH
 # access for users whose user name matches one of the patterns. This is done
 # by setting the value of `AllowUsers` option in `/etc/ssh/sshd_config` file.
 # If an USER@HOST format will be used, the specified user will be allowed only on that particular host.
 rhel9cis_sshd_allowusers: "{% if ansible_facts.user_id != 'root' %}{{ ansible_facts.user_id }}{% elif ansible_env.SUDO_USER is defined %}{{ ansible_env.SUDO_USER }}{% endif %}"
-
+## Control 5.1.7 - Ensure sshd access is configured
 # (String) This variable, if specified, configures a list of GROUP name patterns, separated by spaces, to allow SSH access
 # for users whose primary group or supplementary group list matches one of the patterns. This is done
 # by setting the value of `AllowGroups` option in `/etc/ssh/sshd_config` file.
 rhel9cis_sshd_allowgroups: ""
-
+## Control 5.1.7 - Ensure sshd access is configured
 # This variable, if specified, configures a list of USER name patterns, separated by spaces, to prevent SSH access
 # for users whose user name matches one of the patterns. This is done
 # by setting the value of `DenyUsers` option in `/etc/ssh/sshd_config` file.
 # If an USER@HOST format will be used, the specified user will be restricted only on that particular host.
 rhel9cis_sshd_denyusers: "nobody"
-
+## Control 5.1.7 - Ensure sshd access is configured
 # This variable, if specified, configures a list of GROUP name patterns, separated by spaces,
 # to prevent SSH access for users whose primary group or supplementary group list matches one of the patterns. This is done
 # by setting the value of `DenyGroups` option in `/etc/ssh/sshd_config` file.
 rhel9cis_sshd_denygroups: ""
 
-## - 5.1.9 - ClientAlive and CountMax
-# default settings allow 45 seconds e.g. count x interval
+## Control 5.1.9 - Ensure sshd ClientAliveInterval and ClientAliveCountMax are configured
 # This variable sets the maximum number of unresponsive "keep-alive" messages
 # that can be sent from the server to the client before the connection is considered
 # inactive and thus, closed.
@@ -796,17 +909,19 @@ rhel9cis_sshd_clientalivecountmax: 3
 # keep the connection alive and prevent it being terminated due to inactivity.
 rhel9cis_sshd_clientaliveinterval: 15
 
-## Control 5.1.12 - disable forwarding
+## Control 5.1.10 - Ensure sshd DisableForwarding is enabled
 # By Default this will also disablex11 forwarding
 # set 'yes' if x11 is required this can be changed to run in /etc/ssh/ssh_config.d/50-redhat.conf
+# This variable's value is used in the `/etc/ssh/ssh_config.d/50-redhat.conf` file to
+# disable X11Forwarding. If X11 is required, set this variable's value to `yes`!
 rhel9cis_sshd_x11forwarding: 'no'
 
-## - 5.2.14 - Ensure SSH LoginGraceTime is set to one minute or less
+## Control 5.1.14 - Ensure SSH LoginGraceTime is set to one minute or less
 # This variable specifies the amount of seconds allowed for successful authentication to
 # the SSH server.
 rhel9cis_sshd_logingracetime: 60
 
-## Control 5.2.15 - Ensure SSH LogLevel is appropriate
+## Control 5.1.15 - Ensure SSH LogLevel is appropriate
 # This variable is used to control the verbosity of the logging produced by the SSH server.
 # The options for setting it are as follows:
 # - `QUIET`: Minimal logging;
@@ -818,19 +933,19 @@ rhel9cis_sshd_logingracetime: 60
 # - `DEBUG(x)`: Whereas x = debug level 1 to 3, DEBUG=DEBUG1.
 rhel9cis_ssh_loglevel: INFO
 
-## Control 5.1.16 MaxAuthTries configured
+## Control 5.1.16 - Ensure sshd MaxAuthTries is configured
 # The MaxAuthTries parameter specifies the maximum number of authentication
 # attempts permitted per connection. When the login failure count reaches half the
 # number, error messages will be written to the syslog file detailing the login failure.
 rhel9cis_ssh_maxauthtries: '4'
 
-## Control 5.1.17 MaxStartups
+## Control 5.1.17 - Ensure sshd MaxStartups is configured
 # The MaxStartups parameter specifies the maximum number of concurrent unauthenticated connections to the SSH daemon.
 rhel9cis_ssh_maxstartups: '10:30:60'
 
-## Control 5.1.18 - Ensure SSH MaxSessions is set to 10 or less
+## Control 5.1.18 - Ensure sshd MaxSessions is configured
 # This variable value specifies the maximum number of open sessions that are permitted from
-# a given location
+# a given location. CIS recommends it to be 10 or less.
 rhel9cis_ssh_maxsessions: 4
 
 ## Control 5.2.x - Ensure sudo log file exists
@@ -839,162 +954,200 @@ rhel9cis_ssh_maxsessions: 4
 # This variable defines the path and file name of the sudo log file.
 rhel9cis_sudolog_location: "/var/log/sudo.log"
 
-## Control 5.2.x -Ensure sudo authentication timeout is configured correctly
+## Control 5.2.4 - Ensure users must provide password for escalation
+# The following variable specifies a list of users that should not be required to provide a password
+# for escalation. Feel free to edit it according to your needs.
+rhel9cis_sudoers_exclude_nopasswd_list:
+  - ec2-user
+  - vagrant
+
+## Control 5.2.6 - Ensure sudo authentication timeout is configured correctly
 # This variable sets the duration (in minutes) during which a user's authentication credentials
 # are cached after successfully authenticating using "sudo". This allows the user to execute
 # multiple commands with elevated privileges without needing to re-enter their password for each
 # command within the specified time period. CIS requires a value of at most 15 minutes.
 rhel9cis_sudo_timestamp_timeout: 15
 
-## Control 5.2.4
-# This will leave NOPASSWD intact for these users
-rhel9cis_sudoers_exclude_nopasswd_list:
-  - ec2-user
-  - vagrant
-
-## Control 5.2 - Ensure access to the 'su' command is restricted
+## Control 5.2.7 - Ensure access to the 'su' command is restricted
 # This variable determines the name of the group of users that are allowed to use the su command.
 # CIS requires that such a group be CREATED(named according to site policy) and be kept EMPTY.
 rhel9cis_sugroup: sugroup
 
-## 5.3.x PAM and Authselect
+## Controls 5.3.x PAM and Authselect
 # Do not use authselect if:
 # Your host is part of Linux Identity Management.
 # Joining your host to an IdM domain with the ipa-client-install command automatically configures SSSD authentication on your host.
 # Your host is part of Active Directory via SSSD.
 # Calling the realm join command to join your host to an Active Directory domain automatically configures SSSD authentication on your host.
 rhel9cis_allow_authselect_updates: true
-##
+## Control 5.3.1.2 - Ensure latest version of authselect is installed
+# The following variables controls the implementation of control 5.3.1.2.
+# If you want the latest version to be installed set this variable's value
+# to `true`.
 rhel9cis_authselect_pkg_update: false  # NOTE the risks if system is using SSSD or using ipa-client-install
 
 ## PAM AND Authselect
 
-# To create a new profile (best for greenfield fresh sites not configured)
-# This allows creation of a custom profile using an existing one to build from
-# will only create if profiel does not already exist
-## options true or false
-rhel9cis_authselect_custom_profile_create: true
-## Controls:
-#  - 5.3.2.1 - Ensure custom authselect profile is used
-# Settings in place now will fail, they are placeholders from the control example. Due to the way many multiple
-# options and ways to configure this control needs to be enabled and settings adjusted to minimise risk.
+## Controls 5.3.x
 
 # This variable configures the name of the custom profile to be created and selected.
-# To be changed from default - cis_example_profile
+# To be changed from default - cis_example_profile. This setting needs to be adjusted
+# in order to minimise risk.
 rhel9cis_authselect_custom_profile_name: cis_example_profile
 # Name of the existing authselect profile to copy - options can be found with
 # ```authselect list``` on the host to be configured
 rhel9cis_authselect_default_profile_to_copy: "sssd --symlink-meta"
 
-## Controls
-# - 5.3.3. - Ensure lockout for failed password attempts is configured
-# - 5.5.3 - Ensure password reuse is limited
-# - 5.5.4 - Ensure password hashing algorithm is SHA-512
-# - 5.4.2 -  Ensure authselect includes with-faillock
-# - 5.3.3.1.1
+## Control 5.3.3.1.1 -
 # This variable sets the amount of tries a password can be entered, before a user is locked.
 rhel9cis_pam_faillock_deny: 5
-# - 5.3.3.1.2
+## Control 5.3.3.2, 5.3.2.2
 # This variable sets the amount of time a user will be unlocked after the max amount of
-#   password failures.
+# password failures.
 rhel9cis_pam_faillock_unlock_time: 900
-# This variable represents the number of password change cycles, after which
-# an user can re-use a password.
-# CIS requires a value of 5 or more.
-# 5.3.3.1.3 Locking even deny root or root unlock times
-# rhel9cis_pamroot_lock_option options are
-# even_deny_root
-# root_unlock_time = {{ rhel9cis_root_unlock_time }}
-rhel9cis_root_unlock_time: 60
-rhel9cis_pamroot_lock_option: even_deny_root
-# rhel9cis_pamroot_lock_option: "root_unlock_time = {{ rhel9cis_root_unlock_time }}"
 
-# 5.3.3.2.1 - password difok
+## Control 5.3.3.1.3 - Ensure password failed attempts lockout includes root account
+# This variable is used in the task that ensures that even the root account
+# is included in the password failed attempts lockout measure.
+# The following variable is used in the 'regexp' field. This field is used to find the
+# line in the file. If the line matches the regular expression, it will be replaced
+# with the line parameter's value.
+rhel9cis_pamroot_lock_option: even_deny_root
+
+## Control 5.3.3.2.1 - Ensure password number of changed characters is configured
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password number of changed characters is configured' control.
 rhel9cis_passwd_difok_file: etc/security/pwquality.conf.d/50-pwdifok.conf  # pragma: allowlist secret
+# This variable's value represents the minimum number of characters that must be different between
+# the new password and the old password. It helps ensure that users don't create new passwords that
+# are too similar to their previous ones, enhancing security. CIS states that this value should be at least 2.
 rhel9cis_passwd_difok_value: 2
 
-# 5.3.3.2.2 - password minlength
+## Control 5.3.3.2.2 - Ensure minimum password length is configured
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure minimum password length is configured' control.
 rhel9cis_passwd_minlen_file: etc/security/pwquality.conf.d/50-pwlength.conf  # pragma: allowlist secret
+# This variable specifies the minimum length that a password must  have to be considered valid.
+# CIS states that this value should be at least 14.
 rhel9cis_passwd_minlen_value: 14
 
-# 5.3.3.2.3 - password complex
+## Control 5.3.3.2.3 - Ensure password complexity is configured
+# The following variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password complexity is configured' control.
 rhel9cis_passwd_complex_file: etc/security/pwquality.conf.d/50-pwcomplexity.conf  # pragma: allowlist secret
-# Choose if using minclass or credits options
-# Options are: minclass or credits
-# ensure only one is selected
+# This variable holds the options for configuring the password complexity.
+# Options supported are: 'minclass' or 'credits'.
 rhel9cis_passwd_complex_option: minclass  # pragma: allowlist secret
-rhel9cis_passwd_minclass: 3
-# rhel9cis_passwd_complex: credits
+# The following variable sets the password complexity via 'minclass'. The 'minclass' option provides
+# the minimum number of classes of characters required in a new password. (digits, uppercase, lowercase, others). e.g.
+# For example a value of 4 would mean that it requires digits, uppercase, lower case, and special characters.
+rhel9cis_passwd_minclass: 4
+# The following variables set the password complexity via the 'credits' option.
+# Each of the variables represents a requirement for complexity.
+# The 'dcredit' variable is the maximum credit for having digits in the new password.
+# If less than 0 it is the minimum number of digits in the new password.
+# e.g. dcredit = -1 requires at least one digit
 rhel9cis_passwd_dcredit: -1
+# The 'ucredit' variable is the maximum credit for having uppercase characters in the new password.
+# If less than 0 it is the minimum number of uppercase characters in the new password.
+# e.g. ucredit = -1 requires at least one uppercase character
 rhel9cis_passwd_ucredit: -2
+# The 'ocredit' variable is the maximum credit for having other characters in the new password.
+# If less than 0 it is the minimum number of other characters in the new password.
+# e.g. ocredit = -1 requires at least one special character
 rhel9cis_passwd_ocredit: 0
+# The 'lcredit' variable is the maximum credit for having lowercase characters in the new password.
+# If less than 0 it is the minimum number of lowercase characters in the new password.
+# e.g. lcredit = -1 requires at least one lowercase character
 rhel9cis_passwd_lcredit: -2
 
-# 5.3.3.2.4 - password maxrepeat
+## Control 5.3.3.2.4 - Ensure password same consecutive characters is configured
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password same consecutive characters is configured' control.
 rhel9cis_passwd_maxrepeat_file: etc/security/pwquality.conf.d/50-pwrepeat.conf  # pragma: allowlist secret
+# The following variable sets the maximum number of allowed same consecutive characters in a new password.
 rhel9cis_passwd_maxrepeat_value: 3
 
-# 5.3.3.2.5 - password maxsequence
+## Control 5.3.3.2.5 - Ensure password maximum sequential characters is configured
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password maximum sequential characters is configured' control.
 rhel9cis_passwd_maxsequence_file: etc/security/pwquality.conf.d/50-pwmaxsequence.conf  # pragma: allowlist secret
+# The following variable sets the maximum length of monotonic character sequences in the new password.
+# Examples of such sequence are '12345' or 'fedcb' . The check is disabled if the value is 0 .
 rhel9cis_passwd_maxsequence_value: 3
 
-# 5.3.3.2.6 - password dictcheck
+## Control 5.3.3.2.6 - Ensure password dictionary check is enabled
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password dictionary check is enabled' control
 rhel9cis_passwd_dictcheck_file: etc/security/pwquality.conf.d/50-pwdictcheck.conf  # pragma: allowlist secret
+# The following variable's value sets whether to check for the words from the cracklib dictionary.
+# When set to '1', this option enables dictionary checks, ensuring that passwords are not based on common
+# dictionary words, which helps prevent users from choosing easily guessable passwords.
+# When set to '0', dictionary checks are disabled. CIS states that it shall always be set to '1'.
 rhel9cis_passwd_dictcheck_value: 1
 
-# 5.3.3.2.7 - password quality enforce
-rhel9cis_passwd_quality_enforce_file: etc/security/pwquality.conf.d/50-pwquality_enforce.conf  # pragma: allowlist secret
+# This variable is used in one of the config files to ensure password quality checking is enforced
 rhel9cis_passwd_quality_enforce_value: 1
 
-# 5.3.3.2.8 - password quality enforce for root included with 5.3.3.2.7
+## Control 5.3.3.2.7 - Ensure password quality is enforced for the root user
+# This variable holds the path to the configuration file that will be created (or overwritten if already existing)
+# in order to implement the 'Ensure password quality is enforced for the root user' control.
 rhel9cis_passwd_quality_enforce_root_file: etc/security/pwquality.conf.d/50-pwroot.conf  # pragma: allowlist secret
+# The following variable enforces that the root user must adhere to the same password quality policies as other users.
 rhel9cis_passwd_quality_enforce_root_value: enforce_for_root  # pragma: allowlist secret
 
-# PWhistory
-## 5.3.3.3.1 remember history
-# rhel9cis_pamd_pwhistory_remember: <N> -  <N> is the number of old passwords to remember
+## Control 5.3.3.3.1 - Ensure password history remember is configured
+# This variable represents the number of password change cycles, after which
+# a user can re-use a password. CIS requires a value of 24 or more.
 rhel9cis_pamd_pwhistory_remember: 24
 
-# 5.3.3.4.x
+## Controls  5.3.3.4.3, 5.4.1.4
+# The following variable's value represents the hashing algorithm used
 rhel9cis_passwd_hash_algo: sha512  # pragma: allowlist secret
 
-## Control 5.6.1.1 - Ensure password expiration is 365 days or less
+## Control 5.4.1.1 - Ensure password expiration is 365 days or less
 # This variable governs after how many days a password expires.
 # CIS requires a value of 365 or less.
 rhel9cis_pass_max_days: 365
-## Control 5.6.1.2 - Ensure minimum days between password changes is 7 or more
+# The following variable allows the forcing of setting user_max_days for logins.
+# This can break current connecting user access
+rhel9cis_force_user_maxdays: false
+## Control 5.4.1.2 - Ensure minimum days between password changes is 7 or more
 # This variable specifies the minimum number of days allowed between changing
 # passwords. CIS requires a value of at least 1.
 rhel9cis_pass_min_days: 7
-## Control 5.6.1.3 - Ensure password expiration warning days is 7 or more
+# The following variable allows the force setting of minimum days between changing the password
+# This can break current connecting user access
+rhel9cis_force_user_mindays: false
+## Control 5.4.1.3 - Ensure password expiration warning days is 7 or more
 # This variable governs, how many days before a password expires, the user will be warned.
 # CIS requires a value of at least 7.
 rhel9cis_pass_warn_age: 7
+# The following variable allows the forcing of number of days before warning users of password expiry
+# This can break current connecting user access
+rhel9cis_force_user_warnage: false
 
-## Control 5.4.1.x - Ensure inactive password lock is 30 days or less
+## Control 5.4.1.5 - Ensure inactive password lock is configured
 rhel9cis_inactivelock:
   # This variable specifies the number of days of inactivity before an account will be locked.
   # CIS requires a value of 30 days or less.
   lock_days: 30
 
-## 5.4.1.x Allow the forcing of setting user_max_days for logins.
-# This can break current connecting user access
-rhel9cis_force_user_maxdays: false
-
-## 5.4.1.x Allow the force setting of minimum days between changing the password
-# This can break current connecting user access
-rhel9cis_force_user_mindays: false
-
-## 5.4.1.x Allow the forcing of of number of days before warning users of password expiry
-# This can break current connecting user access
-rhel9cis_force_user_warnage: false
-
-## Control 5.4.1.x - Ensure all users last password change date is in the past
+## Control 5.4.1.6 - Ensure all users last password change date is in the past
 # Allow ansible to expire password for account with a last changed date in the future. Setting it
 # to 'false' will just display users in violation, while 'true' will expire those users passwords.
 rhel9cis_futurepwchgdate_autofix: true
 
-# 5.4.2.x
+## Control 5.4.2.6 - Ensure root user umask is configured
+# The following variable specifies the "umask" to configure for the root user.
+# The user file-creation mode mask ( umask ) is used to determine the file
+# permission for newly created directories and files. In Linux, the default
+# permissions for any newly created directory is 0777 ( rwxrwxrwx ), and for
+# any newly created file it is 0666 ( rw-rw-rw- ). The umask modifies the default
+# Linux permissions by restricting (masking) these permissions. The umask is not
+# simply subtracted, but is processed bitwise. Bits set in the umask are cleared
+# in the resulting file mode. CIS recommends setting 'umask' to '0027' or more
+# restrictive.
 rhel9cis_root_umask: '0027'  # 0027 or more restrictive
 
 ## Control 5.4.2.7 - Ensure system accounts are secured | Set nologin
@@ -1016,52 +1169,38 @@ rhel9cis_shell_session_timeout: 900
 # - `/etc/bash.bashrc`.
 rhel9cis_shell_session_file: /etc/profile.d/tmout.sh
 
-## Control 5.4.3.2 bash umask
+## Control 5.4.3.3 - Ensure default user umask is configured
+# The following variable specifies the "umask" to set in the `/etc/bash.bashrc` and `/etc/profile`.
+# The value needs to be `027` or more restrictive to comply with CIS standards.
 rhel9cis_bash_umask: '0027'  # 0027 or more restrictive
 
-### Controls:
-# - 5.6.2 -  Ensure system accounts are secured
-# - 6.2.10 - Ensure local interactive user home directories exist
-# - 6.2.11 - Ensure local interactive users own their home directories
-# UID settings for interactive users
-# These are discovered via logins.def if set true
-rhel9cis_discover_int_uid: true
-# This variable sets the minimum number from which to search for UID
-# Note that the value will be dynamically overwritten if variable `dicover_int_uid` has
-# been set to `true`.
-min_int_uid: 1000
-### Controls:
-# - Ensure local interactive user home directories exist
-# - Ensure local interactive users own their home directories
-# This variable sets the maximum number at which the search stops for UID
-# Note that the value will be dynamically overwritten if variable `dicover_int_uid` has
-# been set to `true`.
-max_int_uid: 65533
+## Section 6 vars
 
-## Section6 vars
-## Control 6.1.x - allow aide to be configured
+## Control 6.1.1 - Ensure AIDE is installed
 # AIDE is a file integrity checking tool, similar in nature to Tripwire.
 # While it cannot prevent intrusions, it can detect unauthorized changes
 # to configuration files by alerting when the files are changed. Review
 # the AIDE quick start guide and AIDE documentation before proceeding.
-# By setting this variable to `true`, all of the settings related to AIDE will be applied!
+# By setting this variable to `true`, all the settings related to AIDE
+# will be applied!
 rhel9cis_config_aide: true
-
-# If DB file older than below will automatically rebuild DB
+# This variable sets a maximum allowed age of the AIDE database file until
+# the file is rebuilt. If the file is older than the value below, the role
+# will automatically rebuild the database file.
 # e.g. options:1w = 1 week, 1d = 1day 1h = 1 hour
 rhel9cis_aide_db_file_age: 1w
-
-# If aide already setup this forces a new DB to be created
+# If AIDE is already setup this variable forces a new database
+# file to be created.
 rhel9cis_aide_db_recreate: false
-
-# allows to change db file, not config need to be adjusted too
+# This variable is used to check if there is already an existing database file
+# created by AIDE on the target system. If it is not present, the role will generate
+# a database file with the same name as the value of this variable.
 rhel9cis_aide_db_file: /var/lib/aide/aide.db.gz
 
-## Control 6.1.2 AIDE cron settings
-
-## How the aide schedule is run either cron or timer
+## Control 6.1.2 - Ensure filesystem integrity is regularly checked
+# The following variable sets how AIDE is scanned.
+# Available options are either cron or timer.
 rhel9cis_aide_scan: cron
-
 # These are the crontab settings for periodical checking of the filesystem's integrity using AIDE.
 # The sub-settings of this variable provide the parameters required to configure
 # the cron job on the target system.
@@ -1097,22 +1236,69 @@ rhel9cis_aide_cron:
   # can be given in the range `0-7` (both `0` and `7` represent Sunday); several weekdays
   # can be concatenated with commas.
   aide_weekday: '*'
-#
-## Preferred method of logging
-## Whether rsyslog or journald preferred method for local logging
-## Control 6.2.3 | Configure rsyslog
-## Control 6.2.1 | Configure journald
-# This variable governs which logging service should be used, choosing between 'rsyslog'(CIS recommendation)
-# or 'journald'(only one is implemented) will trigger the execution of the associated subsection, as the-best
-# practices are written wholly independent of each other.
-rhel9cis_syslog: journald
 
-## Control 6.2.2.x & 6.2.3.x - Ensure rsyslog is not configured to receive logs from a remote client
-# This variable expresses whether the system is used as a log server or not. If set to:
-#  - 'false', current system will act as a log CLIENT, thus it should NOT receive data from other hosts.
-#  - 'true', current system will act as a log SERVER, enabling centralised log management(by protecting log integrity
-# from local attacks on remote clients)
-rhel9cis_system_is_log_server: false
+## Preferred method of logging
+## Controls 6.2.1.x | Configure systemd-journald service
+## Controls 6.2.2.x | Configured journald
+## Controls 6.2.3.x | Configure rsyslog
+# This variable governs which logging service should be used, choosing between 'rsyslog'
+# or 'journald'(CIS recommendation) will trigger the execution of the associated subsection, as the-best
+# practices are written wholly independent of each other.
+rhel9cis_syslog: rsyslog
+
+## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
+# Current variable configures the max amount of disk space the logs will use(thus, journal files
+# will not grow without bounds)
+# The variables below related to journald, please set these to your site specific values
+# These variable specifies how much disk space the journal may use up at most
+# Specify values in bytes or use K, M, G, T, P, E as units for the specified sizes.
+# See https://www.freedesktop.org/software/systemd/man/journald.conf.html for more information.
+rhel9cis_journald_systemmaxuse: 10M
+## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
+# Current variable configures the amount of disk space to keep free for other uses.
+rhel9cis_journald_systemkeepfree: 100G
+## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
+# This variable configures how much disk space the journal may use up at most.
+# Similar with 'rhel9cis_journald_systemmaxuse', but related to runtime space.
+rhel9cis_journald_runtimemaxuse: 10M
+## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
+# This variable configures the actual amount of disk space to keep free
+# Similar with 'rhel9cis_journald_systemkeepfree', but related to runtime space.
+rhel9cis_journald_runtimekeepfree: 100G
+## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
+# Current variable governs the settings for log retention(how long the log files will be kept).
+# Thus, it specifies the maximum time to store entries in a single journal
+# file before rotating to the next one. Set to 0 to turn off this feature.
+# The given values is interpreted as seconds, unless suffixed with the units
+# `year`, `month`, `week`, `day`, `h` or `m` to override the default time unit of seconds.
+# Values are Xm, Xh, Xday, Xweek, Xmonth, Xyear, for example 2week is two weeks
+# ATTENTION: Uncomment the keyword below when values are set!
+rhel9cis_journald_maxfilesec: 1month
+
+## Control 6.2.2.1.2 - Ensure systemd-journal-upload authentication is configured
+# 'rhel9cis_journal_upload_url' is the ip address to upload the journal entries to
+#  URL value may specify either just the hostname or both the protocol and hostname. 'https' is the default. The port
+#  number may be specified after a colon (":"), otherwise 19532 will be used by default.
+rhel9cis_journal_upload_url: 192.168.50.42
+## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
+# This variable specifies the path to the private key file used by the remote journal
+# server to authenticate itself to the client. This key is used alongside the server's
+# public certificate to establish secure communication. The path below has the default
+# path/file, but it is also allowed for a user to create its custom path/filename.
+rhel9cis_journal_upload_serverkeyfile: "/etc/ssl/private/journal-upload.pem"
+## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
+# This variable specifies the path to the public certificate file of the remote journal
+# server. This certificate is used to verify the authenticity of the remote server. The path
+# below has the default path/file, but it is also allowed for a user to create its custom
+# path/filename.
+rhel9cis_journal_servercertificatefile: "/etc/ssl/certs/journal-upload.pem"
+## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
+# This variable specifies the path to a file containing one or more public certificates
+# of certificate authorities (CAs) that the client trusts. These trusted certificates are used
+# to validate the authenticity of the remote server's certificate. The path below has the default
+## path/file, but it is also allowed for a user to create its custom path/filename.
+rhel9cis_journal_trustedcertificatefile: "/etc/ssl/ca/trusted.pem"
+# ATTENTION: Uncomment the keyword below when values are set!
 
 ## Control 6.2.3.5 | PATCH | Ensure logging is configured
 # This variable governs if current Ansible role should manage syslog settings
@@ -1155,59 +1341,40 @@ rhel9cis_remote_log_retrycount: 100
 # of rsyslog forwarding must be enabled('rhel9cis_remote_log_server: true').
 rhel9cis_remote_log_queuesize: 1000
 
-## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
-# 'rhel9cis_journal_upload_url' is the ip address to upload the journal entries to
-#  URL value may specify either just the hostname or both the protocol and hostname. 'https' is the default. The port
-#  number may be specified after a colon (":"), otherwise 19532 will be used by default.
-rhel9cis_journal_upload_url: 192.168.50.42
-## The paths below have the default paths/files, but allow user to create custom paths/filenames
+## Control 6.2.3.7 - Ensure rsyslog is not configured to receive logs from a remote client
+# This variable expresses whether the system is used as a log server or not. If set to:
+#  - 'false', current system will act as a log CLIENT, thus it should NOT receive data from other hosts.
+#  - 'true', current system will act as a log SERVER, enabling centralised log management(by protecting log integrity
+# from local attacks on remote clients)
+rhel9cis_system_is_log_server: false
 
-## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
-# This variable specifies the path to the private key file used by the remote journal
-# server to authenticate itself to the client. This key is used alongside the server's
-# public certificate to establish secure communication.
-rhel9cis_journal_upload_serverkeyfile: "/etc/ssl/private/journal-upload.pem"
-## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
-# This variable specifies the path to the public certificate file of the remote journal
-# server. This certificate is used to verify the authenticity of the remote server.
-rhel9cis_journal_servercertificatefile: "/etc/ssl/certs/journal-upload.pem"
-## Control 6.2.2.1.2 - Ensure systemd-journal-remote is configured
-# This variable specifies the path to a file containing one or more public certificates
-# of certificate authorities (CAs) that the client trusts. These trusted certificates are used
-# to validate the authenticity of the remote server's certificate.
-rhel9cis_journal_trustedcertificatefile: "/etc/ssl/ca/trusted.pem"
-# ATTENTION: Uncomment the keyword below when values are set!
+## Control 6.2.3.8 rsyslog rotate
+# This variable configures whether to set your own rsyslog logrotate setting
+# alternate to logrotate default settings. Please refer to logrotate options
+# to match your site requirements
+# This variable sets when to rotate
+rhel9cis_rsyslog_logrotate_rotated_when: weekly
+# This variable sets how many rotations of the file to keep
+rhel9cis_rsyslog_logrotate_rotatation_keep: 4
+# The following variable defines whether to set the compress option
+# or not. Setting it to `true` will carry out the setting.
+rhel9cis_rsyslog_logrotate_compress: true
+# The following variable defines whether to set the missingok option
+# or not. Setting it to `true` will carry out the setting.
+rhel9cis_rsyslog_logrotate_missingok: true
+# The following variable defines whether to set the notifempty option
+# or not. Setting it to `true` will carry out the setting.
+rhel9cis_rsyslog_logrotate_notifempty: true
+# The following variable defines whether to set extra options that can
+# be defined in the `rhel9cis_rsyslog_logrotate_create_opts` variable
+# The variable can be found underneath this variable, in a commented
+# state.
+rhel9cis_rsyslog_logrotate_create: true
+# Extra options that can be added according to rsyslog documentation
+# Uncomment and add the required options e.g. mode owner group
+# rhel9cis_rsyslog_logrotate_create_opts:
 
-## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
-# Current variable configures the max amount of disk space the logs will use(thus, journal files
-# will not grow without bounds)
-# The variables below related to journald, please set these to your site specific values
-# These variable specifies how much disk space the journal may use up at most
-# Specify values in bytes or use K, M, G, T, P, E as units for the specified sizes.
-# See https://www.freedesktop.org/software/systemd/man/journald.conf.html for more information.
-rhel9cis_journald_systemmaxuse: 10M
-## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
-# Current variable configures the amount of disk space to keep free for other uses.
-rhel9cis_journald_systemkeepfree: 100G
-## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
-# This variable configures how much disk space the journal may use up at most.
-# Similar with 'rhel9cis_journald_systemmaxuse', but related to runtime space.
-rhel9cis_journald_runtimemaxuse: 10M
-## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
-# This variable configures the actual amount of disk space to keep free
-# Similar with 'rhel9cis_journald_systemkeepfree', but related to runtime space.
-rhel9cis_journald_runtimekeepfree: 100G
-## Control 6.2.1.3 - Ensure journald log rotation is configured per site policy
-# Current variable governs the settings for log retention(how long the log files will be kept).
-# Thus, it specifies the maximum time to store entries in a single journal
-# file before rotating to the next one. Set to 0 to turn off this feature.
-# The given values is interpreted as seconds, unless suffixed with the units
-# `year`, `month`, `week`, `day`, `h` or `m` to override the default time unit of seconds.
-# Values are Xm, Xh, Xday, Xweek, Xmonth, Xyear, for example 2week is two weeks
-# ATTENTION: Uncomment the keyword below when values are set!
-rhel9cis_journald_maxfilesec: 1month
-
-##  Control 6.3.2.1 - Ensure audit_backlog_limit is sufficient
+##  Control 6.3.1.3 - Ensure audit_backlog_limit is sufficient
 # This variable represents the audit backlog limit, i.e., the maximum number of audit records that the
 # system can buffer in memory, if the audit subsystem is unable to process them in real-time.
 # Buffering in memory is useful in situations, where the audit system is overwhelmed
@@ -1216,13 +1383,14 @@ rhel9cis_journald_maxfilesec: 1month
 rhel9cis_audit_back_log_limit: 8192
 
 ## Controls 6.3.2.x - What to do when log files fill up
+
 ## Control 6.3.2.1 - Ensure audit log storage size is configured
 # This variable specifies the maximum size in MB that an audit log file can reach
 # before it is archived or deleted to make space for the new audit data.
 # This should be set based on your sites policy. CIS does not provide a specific value.
 rhel9cis_auditd_max_log_file_size: 10
 
-## Control 6.3.2.2
+## Control 6.3.2.2 - Ensure audit logs are not automatically deleted
 # This variable determines what action the audit system should take when the maximum
 # size of a log file is reached.
 # The options for setting this variable are as follows:
@@ -1234,39 +1402,66 @@ rhel9cis_auditd_max_log_file_size: 10
 # CIS prescribes the value `keep_logs`.
 rhel9cis_auditd_max_log_file_action: keep_logs
 
-## Control 6.3.2.3
-# This variable determines how the system should act in case of issues with disk
-# The disk_full_action parameter tells the system what action to take when no free space is available on the partition that holds the audit log files.
+## Control 6.3.2.3 - Ensure system is disabled when audit logs are full
+# This variable determines how the system should act in case of issues with the disk.
+# The disk_full_action parameter tells the system what action to take when no free space is
+# available on the partition that holds the audit log files.
 # Valid values are ignore, syslog, rotate, exec, suspend, single, and halt.
-#
-# The disk_error_action parameter tells the system what action to take when an error is detected on the partition that holds the audit log files.
-# Valid values are ignore, syslog, exec, suspend, single, and halt.
-#
 # CIS prescribes
 # disk_full_action parameter:
-# Set to halt - the auditd daemon will shutdown the system when the disk partition containing the audit logs becomes full.
-# Set to single - the auditd daemon will put the computer system in single user mode when the disk partition containing the audit logs becomes full.
-#
-# disk_error_action parameter:
-# Set to halt - the auditd daemon will shutdown the system when an error is detected on the partition that holds the audit log files.
-# Set to single - the auditd daemon will put the computer system in single user mode when an error is detected on the partition that holds the audit log files.
-# Set to syslog - the auditd daemon will issue no more than 5 consecutive warnings to syslog when an error is detected on the partition that holds the audit log files.
+# Set to halt - the auditd daemon will shutdown the system when the disk partition containing
+# the audit logs becomes full.
+# Set to single - the auditd daemon will put the computer system in single user mode when the
+# disk partition containing the audit logs becomes full.
 rhel9cis_auditd_disk_full_action: halt
+# This variable determines how the system should act in case of issues with the disk.
+# The disk_error_action parameter tells the system what action to take when an error is detected
+# on the partition that holds the audit log files.
+# Valid values are ignore, syslog, exec, suspend, single, and halt.
+# disk_error_action parameter:
+# Set to halt - the auditd daemon will shutdown the system when an error is detected on the
+# partition that holds the audit log files.
+# Set to single - the auditd daemon will put the computer system in single user mode when
+# an error is detected on the partition that holds the audit log files.
+# Set to syslog - the auditd daemon will issue no more than 5 consecutive warnings to syslog
+# when an error is detected on the partition that holds the audit log files.
 rhel9cis_auditd_disk_error_action: syslog
 
-# Control 6.3.2.4
-# Wait to do when space left is low.
-# The space_left_action parameter tells the system what action to take when the system has detected that it is starting to get low on disk space.
-# Valid values are ignore, syslog, rotate, email, exec, suspend, single, and halt.
-# The admin_space_left_action parameter tells the system what action to take when the system has detected that it is low on disk space.
-# Valid values are ignore, syslog, rotate, email, exec, suspend, single, and halt.
+## Control 6.3.2.4 - Ensure system warns when audit logs are low on space
+# This variable tells the system what action to take when the system has detected
+# that it is starting to get low on disk space.
+# The options for setting this variable are as follows:
+# "ignore"  - the system does nothing when presented with the aforementioned issue;
+# "syslog" - a message is sent to the system log about disk space running low;
+# "email"  - the system sends an email notification to the email address
+#            specified in the "action_mail_acct" variable;
+# "exec"   - the system executes a custom command when disk space is running
+#            low;
+# "suspend" - the system suspends recording audit events until more space is available;
+# "single"  - the audit daemon will put the computer system in single user mode;
+# "halt"    - the system is halted when disk space is critically low;
+# CIS prescribes either 'email', 'exec', `single` or `halt`.
 rhel9cis_auditd_space_left_action: email
+# This variable tells the system what action to take when the system has detected
+# that it is low on disk space.
+# The options for setting this variable are as follows:
+# "ignore"  - the system does nothing when presented with the aforementioned issue;
+# "syslog"  - a message is sent to the system log about disk space running low;
+# "email"  - the system sends an email notification to the email address
+#            specified in the "action_mail_acct" variable;
+# "exec"   - the system executes a custom command when disk space is running
+#            low;
+# "suspend" - the system suspends recording audit events until more space is available;
+# "single"  - the audit daemon will put the computer system in single user mode;
+# "halt"    - the system is halted when disk space is critically low;
+# CIS prescribes either `halt` or `single`.
 rhel9cis_auditd_admin_space_left_action: halt
 
-# This value governs if the below extra-vars for auditd should be used by the role
+# This value governs if the below extra-vars (found in the `rhel9cis_auditd_extra_conf`)
+# for auditd should be used by the role.
 rhel9cis_auditd_extra_conf_usage: false
 
-# 6.3.3.x allow exceptions for UID in auditd config
+## Controls 6.3.3.x allow exceptions for UID in auditd config
 ## Advanced option found in auditd post
 # This variable governs if defining user exceptions for auditd logging is acceptable.
 rhel9cis_allow_auditd_uid_user_exclusions: false
@@ -1275,18 +1470,27 @@ rhel9cis_auditd_uid_exclude:
   - 1999
 
 # This can be used to configure other keys in auditd.conf
-# Example:
 rhel9cis_auditd_extra_conf:
+  # This variable governs the threshold(MegaBytes) under which the audit daemon should perform a
+  # specific action to alert that the system is running low on disk space. Must be lower than
+  # the 'space_left' variable.
   admin_space_left: '10%'
 
 # Section 7 Vars
 
-# 7.1.12 Ensure no files or directories without an owner and a group exist
-rhel9cis_exclude_unowned_search_path: (! -path "/run/user/*" -a ! -path "/proc/*" -a ! -path "*/containerd/*" -a ! -path "*/kubelet/pods/*" -a ! -path "*/kubelet/plugins/*" -a ! -path "/sys/fs/cgroup/memory/*" -a ! -path "/var/*/private/*")
+## Control 7.1.11 - Ensure no world writable files exist
+# The following variable is a toggle for enabling/disabling the automated
+# removal of world-writable permissions from all files.
+# Possible values are `true` and `false`.
+rhel9cis_no_world_write_adjust: true
 
-# Control 7.1.12
+## Control 7.1.12 - Ensure no files or directories without an owner and a group exist
+# This variable holds the part of the command that helps detect which files and
+# directories do not have an owner and an affiliated group.
+rhel9cis_exclude_unowned_search_path: (! -path "/run/user/*" -a ! -path "/proc/*" -a ! -path "*/containerd/*" -a ! -path "*/kubelet/pods/*" -a ! -path "*/kubelet/plugins/*" -a ! -path "/sys/fs/cgroup/memory/*" -a ! -path "/var/*/private/*")
 # The value of this variable specifies the owner that will be set for unowned files and directories.
 rhel9cis_unowned_owner: root
+# The value of this variable specifies the group that will be set for ungrouped files and directories.
 rhel9cis_ungrouped_group: root
 # This variable is a toggle for enabling/disabling the automated
 # setting of an owner (specified in variable `rhel9cis_unowned_owner`)
@@ -1294,12 +1498,28 @@ rhel9cis_ungrouped_group: root
 # Possible values are `true` and `false`.
 rhel9cis_ownership_adjust: true
 
-## Control 7.1.13
+## Control 7.1.13 - Ensure SUID and SGID files are reviewed
 # This variable is a toggle for enabling/disabling the automated removal
 # of the SUID bit from all files on all mounts.
 # Possible values are `true` and `false`.
 rhel9cis_suid_sgid_adjust: false
 
-## Control 7.1.11 - Ensure no world writable files exist
-# Allow ansible to adjust world-writable files. False will just display world-writable files, True will remove world-writable.
-rhel9cis_no_world_write_adjust: true
+## Control 7.2.8 - Ensure local interactive user home directories are configured
+# UID settings for interactive users
+# These are discovered via logins.def if set true
+rhel9cis_discover_int_uid: true
+# This variable sets the minimum number from which to search for UID
+# Note that the value will be dynamically overwritten if variable `rhel9cis_discover_int_uid` has
+# been set to `true`.
+min_int_uid: 1000
+# This variable sets the maximum number at which the search stops for UID
+# Note that the value will be dynamically overwritten if variable `rhel9cis_discover_int_uid` has
+# been set to `true`.
+max_int_uid: 65533
+
+## Control 7.2.9 - Ensure local interactive user dot files access is configured
+# This variable is a toggle for enabling/disabling the automated modification of
+# permissions on dot files.
+# Possible values are `true` and `false`
+# This setting can impact a running system if not tested sufficiently
+rhel9cis_dotperm_ansiblemanaged: false
diff --git a/handlers/main.yml b/handlers/main.yml
index 3c51ddf..1ef6ccf 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -144,6 +144,15 @@
     state: remounted
   listen: "Remount /var/log/audit"
 
+- name: "Remounting /boot/efi"
+  vars:
+    mount_point: '/boot/efi'
+  ansible.posix.mount:
+    path: "{{ mount_point }}"
+    state: remounted
+  notify: Change_requires_reboot
+  listen: "Remount /boot/efi"
+
 - name: Reload sysctl
   ansible.builtin.command: sysctl --system
   changed_when: true
@@ -177,7 +186,7 @@
 
 - name: Update Crypto Policy
   ansible.builtin.set_fact:
-    rhel9cis_full_crypto_policy: "{{ rhel9cis_crypto_policy }}{% if rhel9cis_crypto_policy_module | length > 0 %}{{ rhel9cis_crypto_policy_module }}{% endif %}"
+    rhel9cis_full_crypto_policy: "{{ rhel9cis_crypto_policy }}{{ rhel9cis_crypto_policy_module }}{% if rhel9cis_additional_crypto_policy_module | length > 0 %}:{{ rhel9cis_additional_crypto_policy_module }}{% endif %}"
   notify: Set Crypto Policy
 
 - name: Set Crypto Policy
@@ -254,7 +263,7 @@
   listen: Restart auditd
 
 - name: Start auditd process
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     name: auditd
     state: started
   listen: Restart auditd
diff --git a/tasks/audit_only.yml b/tasks/audit_only.yml
index 1377f9f..a33cb94 100644
--- a/tasks/audit_only.yml
+++ b/tasks/audit_only.yml
@@ -1,27 +1,17 @@
 ---
-- name: Audit_Only | Create local Directories for hosts
-  when: fetch_audit_files
-  ansible.builtin.file:
-    mode: 'u+x,go-w'
-    path: "{{ audit_capture_files_dir }}/{{ inventory_hostname }}"
-    recurse: true
-    state: directory
-  delegate_to: localhost
-  become: false
 
-- name: Audit_only | Get audits from systems and put in group dir
-  when: fetch_audit_files
-  ansible.builtin.fetch:
-    dest: "{{ audit_capture_files_dir }}/{{ inventory_hostname }}/"
-    flat: true
-    mode: 'go-wx'
-    src: "{{ pre_audit_outfile }}"
+- name: Audit_only | Fetch audit files
+  when:
+    - fetch_audit_output
+    - audit_only
+  ansible.builtin.import_tasks:
+    file: fetch_audit_output.yml
 
 - name: Audit_only | Show Audit Summary
   when: audit_only
   ansible.builtin.debug:
     msg: "{{ audit_results.split('\n') }}"
 
-- name: Audit_only | Stop Playbook Audit Only selected
+- name: Audit_only | Stop task for host as audit_only selected
   when: audit_only
-  ansible.builtin.meta: end_play
+  ansible.builtin.meta: end_host
diff --git a/tasks/auditd.yml b/tasks/auditd.yml
index 7b86b94..9ada459 100644
--- a/tasks/auditd.yml
+++ b/tasks/auditd.yml
@@ -7,6 +7,7 @@
 - name: "POST | AUDITD | Set supported_syscalls variable"
   ansible.builtin.shell: ausyscall --dump |  awk  '{print $2}'
   changed_when: false
+  check_mode: false
   failed_when: discovered_auditd_syscalls.rc not in [ 0, 1 ]
   register: discovered_auditd_syscalls
 
@@ -24,7 +25,7 @@
     dest: /etc/audit/rules.d/99_auditd.rules
     owner: root
     group: root
-    mode: 'u-x,go-wx'
+    mode: 'u-x,g-wx,o-rwx'
   diff: "{{ discovered_auditd_rules_file.stat.exists }}"  # Only run diff if not a new file
   register: discovered_auditd_rules_template_updated
   notify:
diff --git a/tasks/fetch_audit_output.yml b/tasks/fetch_audit_output.yml
new file mode 100644
index 0000000..e440185
--- /dev/null
+++ b/tasks/fetch_audit_output.yml
@@ -0,0 +1,47 @@
+---
+
+# Stage to copy audit output to a centralised location
+
+- name: "POST | FETCH | Fetch files and copy to controller"
+  when: audit_output_collection_method == "fetch"
+  ansible.builtin.fetch:
+    src: "{{ item }}"
+    dest: "{{ audit_output_destination }}"
+    flat: true
+  changed_when: true
+  failed_when: false
+  register: discovered_audit_fetch_state
+  loop:
+    - "{{ pre_audit_outfile }}"
+    - "{{ post_audit_outfile }}"
+  become: false
+
+# Added this option for continuity but could be changed by adjusting the variable audit_conf_dest
+# Allowing backup to one location
+- name: "POST | FETCH | Copy files to location available to managed node"
+  when: audit_output_collection_method == "copy"
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "{{ audit_output_destination }}"
+    mode: 'u-x,go-wx'
+    flat: true
+  failed_when: false
+  register: discovered_audit_copy_state
+  loop:
+    - "{{ pre_audit_outfile }}"
+    - "{{ post_audit_outfile }}"
+
+- name: "POST | FETCH | Fetch files and copy to controller | Warning if issues with fetch_audit_files"
+  when:
+    - (audit_output_collection_method == "fetch" and not discovered_audit_fetch_state.changed) or
+      (audit_output_collection_method == "copy" and not discovered_audit_copy_state.changed)
+  block:
+    - name: "POST | FETCH | Fetch files and copy to controller | Warning if issues with fetch_audit_files"
+      ansible.builtin.debug:
+        msg: "Warning!! Unable to write to localhost {{ audit_output_destination }} for audit file copy"
+
+    - name: "POST | FETCH | Fetch files and copy to controller | Warning if issues with fetch_audit_files"
+      vars:
+        warn_control_id: "FETCH_AUDIT_FILES"
+      ansible.builtin.import_tasks:
+        file: warning_facts.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 2e5049c..4d1887d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -61,7 +61,7 @@
     - crypto
     - NIST800-53R5_SC-6
   ansible.builtin.assert:
-    that: rhel9cis_crypto_policy_module in rhel9cis_allowed_crypto_policies_modules
+    that: rhel9cis_additional_crypto_policy_module in rhel9cis_allowed_crypto_policies_modules
     fail_msg: "Crypto policy module is not a permitted version"
     success_msg: "Crypto policy module is a permitted version"
 
@@ -93,18 +93,20 @@
       block:
         - name: "Check password set for {{ ansible_env.SUDO_USER }} | Assert local password set"  # noqa name[template]
           ansible.builtin.assert:
-            that:
-              - prelim_ansible_user_password_set.stdout | length != 0
-              - prelim_ansible_user_password_set.stdout != "!!"
-            fail_msg: "You have {{ sudo_password_rule }} enabled but the user = {{ ansible_env.SUDO_USER }} has no password set - It can break access"
-            success_msg: "You have a password set for the {{ ansible_env.SUDO_USER }} user"
+            that: |
+              (
+                ((prelim_ansible_user_password_set.stdout | length != 0) and (prelim_ansible_user_password_set.stdout != "!!" ))
+              or
+                (ansible_env.SUDO_USER in rhel9cis_sudoers_exclude_nopasswd_list)
+              )
+            fail_msg: "You have {{ sudo_password_rule }} enabled but the user = {{ ansible_env.SUDO_USER }} has no password set or or the user is not included in the exception list for rule 5.2.4 - It can break access"
+            success_msg: "You have a password set for the {{ ansible_env.SUDO_USER }} user or the user is included in the exception list for rule 5.2.4"
 
         - name: "Check account is not locked for {{ ansible_env.SUDO_USER }} | Assert local account not locked"  # noqa name[template]
           ansible.builtin.assert:
-            that:
-              - not prelim_ansible_user_password_set.stdout.startswith("!")
+            that: (not prelim_ansible_user_password_set.stdout.startswith("!")) or (ansible_env.SUDO_USER in rhel9cis_sudoers_exclude_nopasswd_list)
             fail_msg: "You have {{ sudo_password_rule }} enabled but the user = {{ ansible_env.SUDO_USER }} is locked - It can break access"
-            success_msg: "The local account is not locked for {{ ansible_env.SUDO_USER }} user"
+            success_msg: "The local account {{ ansible_env.SUDO_USER }} is not locked or included in the exception list for rule 5.2.4"
 
 - name: "Check authselect profile is selected"
   when: rhel9cis_allow_authselect_updates
@@ -116,17 +118,11 @@
         fail_msg: "You still have the default name for your authselect profile"
 
     - name: "Check authselect profile is selected | Check current profile"
-      ansible.builtin.shell: authselect current | head -1 | awk '{print $NF}'
+      ansible.builtin.command: authselect list
       changed_when: false
       failed_when: prelim_authselect_current_profile.rc not in [ 0, 1 ]
       register: prelim_authselect_current_profile
 
-    - name: "Check authselect profile is selected | Ensure profile name is set"
-      ansible.builtin.assert:
-        that: prelim_authselect_current_profile is defined
-        success_msg: "Authselect is running and profile is selected"
-        fail_msg: Authselect updates have been selected there are issues with profile selection"
-
 - name: "Ensure root password is set"
   when: rhel9cis_rule_5_4_2_4
   tags:
@@ -138,8 +134,9 @@
     - rule_5.4.2.4
   block:
     - name: "Ensure root password is set"
-      ansible.builtin.shell: passwd -S root | egrep -e "(Password set, SHA512 crypt|Password locked)"
+      ansible.builtin.shell: LC_ALL=C passwd -S root | grep -E "(Alternate authentication|Password set|Password locked)"
       changed_when: false
+      failed_when: prelim_root_passwd_set.rc not in [ 0, 1 ]
       register: prelim_root_passwd_set
 
     - name: "Ensure root password is set"
@@ -215,11 +212,46 @@
 
 - name: "Run post_remediation audit"
   when: run_audit
+  tags: always
   ansible.builtin.import_tasks:
     file: post_remediation_audit.yml
 
+- name: Add ansible file showing Benchmark and levels applied if audit details not present
+  when:
+    - create_benchmark_facts
+    - (post_audit_summary is defined) or
+      (ansible_local['compliance_facts']['lockdown_audit_details']['audit_summary'] is undefined and post_audit_summary is undefined)
+  tags:
+    - always
+    - benchmark
+  block:
+    - name: Create ansible facts directory if audit facts not present
+      ansible.builtin.file:
+        path: "{{ ansible_facts_path }}"
+        state: directory
+        owner: root
+        group: root
+        mode: 'u=rwx,go=rx'
+
+    - name: Create ansible facts file and levels applied if audit facts not present
+      ansible.builtin.template:
+        src: etc/ansible/compliance_facts.j2
+        dest: "{{ ansible_facts_path }}/compliance_facts.fact"
+        owner: root
+        group: root
+        mode: 'u-x,go=r'
+
+- name: Fetch audit files
+  when:
+    - fetch_audit_output
+    - run_audit
+  tags: always
+  ansible.builtin.import_tasks:
+    file: fetch_audit_output.yml
+
 - name: "Show Audit Summary"
   when: run_audit
+  tags: always
   ansible.builtin.debug:
     msg: "{{ audit_results.split('\n') }}"
 
diff --git a/tasks/parse_etc_password.yml b/tasks/parse_etc_password.yml
index 86c1cac..c7ed865 100644
--- a/tasks/parse_etc_password.yml
+++ b/tasks/parse_etc_password.yml
@@ -4,15 +4,15 @@
   tags: always
   block:
     - name: "PRELIM | 5.5.2 | 6.2.7 | 6.2.8 | 6.2.20 | Parse /etc/passwd"
-      ansible.builtin.command: cat /etc/passwd
+      ansible.builtin.shell: cat /etc/passwd | grep -v '^#'
       changed_when: false
       check_mode: false
-      register: prelim_passwd_file_audit
+      register: prelim_capture_passwd_file
 
-    - name: "PRELIM | 5.5.2 | 6.2.7 | 6.2.8 | 6.2.20 | Split passwd entries"
+    - name: "PRELIM | 5.4.2 | 7.2.8 | Split passwd entries"
       ansible.builtin.set_fact:
-        rhel9cis_passwd: "{{ prelim_passwd_file_audit.stdout_lines | map('regex_replace', ld_passwd_regex, ld_passwd_yaml) | map('from_yaml') | list }}"
-      loop: "{{ prelim_passwd_file_audit.stdout_lines }}"
+        prelim_captured_passwd_data: "{{ prelim_capture_passwd_file.stdout_lines | map('regex_replace', ld_passwd_regex, ld_passwd_yaml) | map('from_yaml') | list }}"
+      loop: "{{ prelim_capture_passwd_file.stdout_lines }}"
       vars:
         ld_passwd_regex: >-
           ^(?P<id>[^:]*):(?P<password>[^:]*):(?P<uid>[^:]*):(?P<gid>[^:]*):(?P<gecos>[^:]*):(?P<dir>[^:]*):(?P<shell>[^:]*)
diff --git a/tasks/post_remediation_audit.yml b/tasks/post_remediation_audit.yml
index 54d5785..5e9419c 100644
--- a/tasks/post_remediation_audit.yml
+++ b/tasks/post_remediation_audit.yml
@@ -1,22 +1,13 @@
 ---
 
 - name: Post Audit | Run post_remediation {{ benchmark }} audit  # noqa name[template]
-  ansible.builtin.command: "{{ audit_conf_dir }}/run_audit.sh -v {{ audit_vars_path }} -f {{ audit_format }} -o {{ post_audit_outfile }} -g \"{{ group_names }}\""
+  ansible.builtin.shell: "umask 0022 && {{ audit_conf_dir }}/run_audit.sh -v {{ audit_vars_path }} -f {{ audit_format }} -m {{ audit_max_concurrent }} -o {{ post_audit_outfile }} -g \"{{ group_names }}\""  # noqa yaml[line-length]
   changed_when: true
   environment:
     AUDIT_BIN: "{{ audit_bin }}"
     AUDIT_CONTENT_LOCATION: "{{ audit_conf_dest | default('/opt') }}"
     AUDIT_FILE: goss.yml
 
-- name: Post Audit | ensure audit files readable by users
-  ansible.builtin.file:
-    path: "{{ item }}"
-    mode: '0644'
-    state: file
-  loop:
-    - "{{ post_audit_outfile }}"
-    - "{{ pre_audit_outfile }}"
-
 - name: Post Audit | Capture audit data if json format
   when: audit_format == "json"
   block:
@@ -33,7 +24,7 @@
   when: audit_format == "documentation"
   block:
     - name: Post Audit | Capture audit data if documentation format
-      ansible.builtin.shell: tail -2 "{{ pre_audit_outfile }}"  | tac | tr '\n' ' '
+      ansible.builtin.shell: tail -2 "{{ post_audit_outfile }}"  | tac | tr '\n' ' '
       changed_when: false
       register: post_audit_summary
 
diff --git a/tasks/pre_remediation_audit.yml b/tasks/pre_remediation_audit.yml
index 61959fa..410473e 100644
--- a/tasks/pre_remediation_audit.yml
+++ b/tasks/pre_remediation_audit.yml
@@ -1,4 +1,5 @@
 ---
+
 - name: Pre Audit Setup | Setup the LE audit
   when: setup_audit
   tags: setup_audit
@@ -57,6 +58,7 @@
     - name: Pre Audit Setup | If audit ensure goss is available
       when: not prelim_goss_available.stat.exists
       ansible.builtin.assert:
+        that: prelim_goss_available['stat']['exists'] == true
         msg: "Audit has been selected: unable to find goss binary at {{ audit_bin }}"
 
 - name: Pre Audit Setup | Copy ansible default vars values to test audit
@@ -70,7 +72,7 @@
     mode: 'go-rwx'
 
 - name: Pre Audit | Run pre_remediation audit {{ benchmark }}  # noqa name[template]
-  ansible.builtin.command: "{{ audit_conf_dir }}/run_audit.sh -v {{ audit_vars_path }} -f {{ audit_format }} -o {{ pre_audit_outfile }} -g \"{{ group_names }}\""  # noqa yaml[line-length]
+  ansible.builtin.shell: "umask 0022 && {{ audit_conf_dir }}/run_audit.sh -v {{ audit_vars_path }} -f {{ audit_format }} -m {{ audit_max_concurrent }} -o {{ pre_audit_outfile }} -g \"{{ group_names }}\"" # noqa yaml[line-length]
   changed_when: true
   environment:
     AUDIT_BIN: "{{ audit_bin }}"
@@ -83,6 +85,7 @@
     - name: Pre Audit | Capture audit data if json format
       ansible.builtin.shell: grep -E '\"summary-line.*Count:.*Failed' "{{ pre_audit_outfile }}" | cut -d'"' -f4
       changed_when: false
+      failed_when: pre_audit_summary.stderr | length > 0
       register: pre_audit_summary
 
     - name: Pre Audit | Set Fact for audit summary
@@ -95,6 +98,7 @@
     - name: Pre Audit | Capture audit data if documentation format
       ansible.builtin.shell: tail -2 "{{ pre_audit_outfile }}"  | tac | tr '\n' ' '
       changed_when: false
+      failed_when: pre_audit_summary.stderr | length > 0
       register: pre_audit_summary
 
     - name: Pre Audit | Set Fact for audit summary
diff --git a/tasks/prelim.yml b/tasks/prelim.yml
index 1ec355b..7c31c25 100644
--- a/tasks/prelim.yml
+++ b/tasks/prelim.yml
@@ -4,9 +4,7 @@
 # List users in order to look files inside each home directory
 
 - name: "PRELIM | Include audit specific variables"
-  when:
-    - run_audit or audit_only
-    - setup_audit
+  when: run_audit or audit_only or setup_audit
   tags:
     - setup_audit
     - run_audit
@@ -14,24 +12,30 @@
     file: audit.yml
 
 - name: "PRELIM | Include pre-remediation audit tasks"
-  when:
-    - run_audit or audit_only
-    - setup_audit
+  when: run_audit or audit_only or setup_audit
   tags: run_audit
   ansible.builtin.import_tasks: pre_remediation_audit.yml
 
 - name: "PRELIM | AUDIT | Interactive Users"
   tags: always
   ansible.builtin.shell: >
-    grep -E -v '^(root|halt|sync|shutdown)' /etc/passwd | awk -F: '(!index($7, "sbin/nologin") && $7 != "/bin/nologin" && $7 != "/bin/false" && $7 != "/dev/null") { print $1 }'
+    grep -E -v '^(root|halt|sync|shutdown)' /etc/passwd | awk -F: '(!index($7, "sbin/nologin") && $7 != "/bin/nologin" && $7 != "/bin/false" && $7 != "/dev/null") { print $1":"$3":"$6 }'
   changed_when: false
-  register: prelim_interactive_usernames
+  check_mode: false
+  register: prelim_interactive_users_raw
+
+- name: "PRELIM | AUDIT | Interactive Users (reformat)"
+  tags: always
+  ansible.builtin.set_fact:
+    prelim_interactive_users: "{{ prelim_interactive_users | default([]) + [dict([('username', item.split(':')[0]), ('uid', item.split(':')[1]), ('home', item.split(':')[2])])] }}"
+  loop: "{{ prelim_interactive_users_raw.stdout_lines }}"
 
 - name: "PRELIM | AUDIT | Interactive User accounts home directories"
   tags: always
   ansible.builtin.shell: >
-    grep -E -v '^(root|halt|sync|shutdown)' /etc/passwd | awk -F: '(!index($7, "sbin/nologin") && $7 != "/bin/nologin" && $7 != "/bin/false") { print $6 }'
+    grep -E -v '^(root|halt|sync|shutdown)' /etc/passwd | awk -F: '(!index($7, "sbin/nologin") && $7 != "/bin/nologin" && $7 != "/bin/false" && $7 != "/dev/null") { print $6 }'
   changed_when: false
+  check_mode: false
   register: prelim_interactive_users_home
 
 - name: "PRELIM | AUDIT | Interactive UIDs"
@@ -39,6 +43,7 @@
   ansible.builtin.shell: >
     grep -E -v '^(root|halt|sync|shutdown)' /etc/passwd | awk -F: '(!index($7, "sbin/nologin") && $7 != "/bin/nologin" && $7 != "/bin/false") { print $3 }'
   changed_when: false
+  check_mode: false
   register: prelim_interactive_uids
 
 - name: "PRELIM | AUDIT | Capture /etc/password variables"
@@ -64,6 +69,7 @@
       ansible.builtin.shell: |
         mount | awk '{print $1, $3, $5, $6}'
       changed_when: false
+      check_mode: false
       register: prelim_mount_output
 
     - name: PRELIM | AUDIT | Section 1.1 | Retrieve mount options - build fact  # This is inherited and used in mountpoints tasks
@@ -100,6 +106,7 @@
       ansible.builtin.command: rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n'  # noqa command-instead-of-module
       changed_when: false
       failed_when: false
+      check_mode: false
       register: prelim_check_gpg_imported
 
     - name: "PRELIM | AUDIT | Import gpg keys | Check Package"  # noqa command-instead-of-module
@@ -107,6 +114,7 @@
       ansible.builtin.shell: rpm -qi redhat-release | grep Signature  # noqa command-instead-of-module
       changed_when: false
       failed_when: false
+      check_mode: false
       register: prelim_os_gpg_package_valid
 
     - name: "PRELIM | PATCH | Force keys to be imported"  # noqa command-instead-of-module
@@ -129,8 +137,7 @@
   register: prelim_systemd_coredump
 
 - name: "PRELIM | PATCH | Setup crypto-policy"
-  when:
-    - rhel9cis_rule_1_6_1
+  when: rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -160,6 +167,7 @@
         current_crypto_module: "{{ prelim_system_wide_crypto_policy.stdout.split(':')[1] }}"
 
 - name: "PRELIM | AUDIT | Set facts based on boot type"
+  tags: always
   block:
     - name: "PRELIM | AUDIT | Check whether machine is UEFI-based"
       ansible.builtin.stat:
@@ -178,17 +186,14 @@
         grub2_path: /etc/grub2-efi.cfg
 
 - name: "PRELIM | AUDIT | Discover Gnome Desktop Environment"
-  tags:
-    - always
+  tags: always
   ansible.builtin.stat:
     path: /usr/share/gnome/gnome-version.xml
   register: prelim_gnome_present
 
 - name: "PRELIM | PATCH | Install dconf if gui installed"
-  when:
-    - rhel9cis_gui
-  tags:
-    - always
+  when: rhel9cis_gui
+  tags: always
   ansible.builtin.package:
     name: dconf
     state: present
@@ -197,13 +202,13 @@
   when:
     - rhel9cis_rule_3_1_2
     - not system_is_container
-  tags:
-    - always
+  tags: always
   block:
-    - name: "PRELIM | AUDIT | Discover is wirelss adapter on system"
+    - name: "PRELIM | AUDIT | Discover is wireless adapter on system"
       ansible.builtin.command: find /sys/class/net/*/ -type d -name wireless
       register: discover_wireless_adapters
       changed_when: false
+      check_mode: false
       failed_when: discover_wireless_adapters.rc not in [ 0, 1 ]
 
     - name: "PRELIM | PATCH | Install Network-Manager | if wireless adapter present"
@@ -243,6 +248,12 @@
     mode: 'go-rwx'
     state: touch
 
+- name: "PRELIM | PATCH | sshd_config.d/50-redhat.conf exists"
+  when: rhel9cis_rule_5_1_10 or rhel9cis_rule_5_1_11
+  ansible.builtin.stat:
+    path: /etc/ssh/sshd_config.d/50-redhat.conf
+  register: prelim_sshd_50_redhat_file
+
 - name: "PRELIM | AUDIT | Capture pam security related files"
   tags: always
   ansible.builtin.find:
@@ -298,6 +309,7 @@
   tags: always
   ansible.builtin.shell: grep ^log_file /etc/audit/auditd.conf | awk '{ print $NF }'
   changed_when: false
+  check_mode: false
   register: prelim_auditd_logfile
 
 - name: "PRELIM | AUDIT | Audit conf and rules files | list files"
@@ -320,27 +332,31 @@
     patterns: '*.conf,*.rules'
   register: prelim_auditd_conf_files
 
-- name: "PRELIM | AUDIT | Discover Interactive UID MIN and MIN from logins.def"
+- name: "PRELIM | AUDIT | Discover Interactive UID_MIN and UID_MAX from /etc/login.defs"
   when: rhel9cis_discover_int_uid
   tags: always
   block:
-    - name: "PRELIM | AUDIT | Capture UID_MIN information from logins.def"
-      ansible.builtin.shell: grep -w "^UID_MIN" /etc/login.defs | awk '{print $NF}'
+    - name: "PRELIM | AUDIT | Capture UID_MIN from /etc/login.defs"
+      ansible.builtin.command: awk '/^UID_MIN/ {print $2}' /etc/login.defs
       changed_when: false
+      failed_when: false
+      check_mode: false
       register: prelim_uid_min_id
 
-    - name: "PRELIM | AUDIT | Capture UID_MAX information from logins.def"
-      ansible.builtin.shell: grep -w "^UID_MAX" /etc/login.defs | awk '{print $NF}'
+    - name: "PRELIM | AUDIT | Capture UID_MAX from /etc/login.defs"
+      ansible.builtin.command: awk '/^UID_MAX/ {print $2}' /etc/login.defs
       changed_when: false
+      failed_when: false
+      check_mode: false
       register: prelim_uid_max_id
 
-    - name: "PRELIM | AUDIT | Set Fact for interactive uid/gid"
-      ansible.builtin.set_fact:
-        prelim_min_int_uid: "{{ prelim_uid_min_id.stdout }}"
-        prelim_max_int_uid: "{{ prelim_uid_max_id.stdout }}"
+- name: "PRELIM | AUDIT | Set facts for interactive UID/GID ranges"
+  tags: always
+  ansible.builtin.set_fact:
+    prelim_min_int_uid: "{{ prelim_uid_min_id.stdout | default(min_int_uid) }}"
+    prelim_max_int_uid: "{{ prelim_uid_max_id.stdout | default(max_int_uid) }}"
 
 - name: "PRELIM | AUDIT | Gather the package facts after prelim"
-  tags:
-    - always
+  tags: always
   ansible.builtin.package_facts:
     manager: auto
diff --git a/tasks/section_1/cis_1.1.2.3.x.yml b/tasks/section_1/cis_1.1.2.3.x.yml
index 998d1ba..635648d 100644
--- a/tasks/section_1/cis_1.1.2.3.x.yml
+++ b/tasks/section_1/cis_1.1.2.3.x.yml
@@ -21,12 +21,12 @@
       register: discovered_home_mount
 
     - name: "1.1.2.3.1 | AUDIT | Ensure /home is a separate partition | Absent"
-      when: discovered_dev_shm_mount is undefined
+      when: discovered_home_mount is undefined
       ansible.builtin.debug:
         msg: "Warning!! {{ required_mount }} is not mounted on a separate partition"
 
     - name: "1.1.2.3.1 | AUDIT | Ensure /home is a separate partition | Present"
-      when: discovered_dev_shm_mount is undefined
+      when: discovered_home_mount is undefined
       ansible.builtin.import_tasks:
         file: warning_facts.yml
 
diff --git a/tasks/section_1/cis_1.1.2.4.x.yml b/tasks/section_1/cis_1.1.2.4.x.yml
index e0afd4e..f89fe3f 100644
--- a/tasks/section_1/cis_1.1.2.4.x.yml
+++ b/tasks/section_1/cis_1.1.2.4.x.yml
@@ -22,12 +22,12 @@
       register: discovered_var_mount
 
     - name: "1.1.2.4.1 | AUDIT | Ensure /var is a separate partition | Absent"
-      when: discovered_dev_shm_mount is undefined
+      when: discovered_var_mount is undefined
       ansible.builtin.debug:
         msg: "Warning!! {{ required_mount }} is not mounted on a separate partition"
 
     - name: "1.1.2.4.1 | AUDIT | Ensure /var is a separate partition | Present"
-      when: discovered_dev_shm_mount is undefined
+      when: discovered_var_mount is undefined
       ansible.builtin.import_tasks:
         file: warning_facts.yml
 
diff --git a/tasks/section_1/cis_1.1.2.6.x.yml b/tasks/section_1/cis_1.1.2.6.x.yml
index 765de3d..b27e4cc 100644
--- a/tasks/section_1/cis_1.1.2.6.x.yml
+++ b/tasks/section_1/cis_1.1.2.6.x.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: "1/.1 | PATCH | Ensure /var/log is a separate partition"
+- name: "1.1.2.6.1 | PATCH | Ensure /var/log is a separate partition"
   when:
     - rhel9cis_rule_1_1_2_6_1
     - required_mount not in prelim_mount_names
diff --git a/tasks/section_1/cis_1.1.2.7.x.yml b/tasks/section_1/cis_1.1.2.7.x.yml
index 2dc5939..b4513dd 100644
--- a/tasks/section_1/cis_1.1.2.7.x.yml
+++ b/tasks/section_1/cis_1.1.2.7.x.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: "1/.1 | PATCH | Ensure /var/log/audit is a separate partition"
+- name: "1.1.2.7.1 | PATCH | Ensure /var/log/audit is a separate partition"
   when:
     - rhel9cis_rule_1_1_2_7_1
     - required_mount not in prelim_mount_names
diff --git a/tasks/section_1/cis_1.3.1.x.yml b/tasks/section_1/cis_1.3.1.x.yml
index 198ae7b..ad7d844 100644
--- a/tasks/section_1/cis_1.3.1.x.yml
+++ b/tasks/section_1/cis_1.3.1.x.yml
@@ -106,7 +106,7 @@
     warn_control_id: '1.3.1.6'
   block:
     - name: "1.3.1.6 | AUDIT | Ensure no unconfined services exist | Find the unconfined services"
-      ansible.builtin.shell: ps -eZ | grep unconfined_service_t | egrep -vw "tr|ps|egrep|bash|awk" | tr ':' ' ' | awk '{ print $NF }'
+      ansible.builtin.shell: ps -eZ | grep unconfined_service_t | grep -Evw "tr|ps|egrep|bash|awk" | tr ':' ' ' | awk '{ print $NF }'
       register: discovered_unconf_services
       failed_when: false
       changed_when: false
diff --git a/tasks/section_1/cis_1.4.x.yml b/tasks/section_1/cis_1.4.x.yml
index d422f14..5969dff 100644
--- a/tasks/section_1/cis_1.4.x.yml
+++ b/tasks/section_1/cis_1.4.x.yml
@@ -29,7 +29,8 @@
     - rule_1.4.2
     - NIST800-53R5_AC-3
   block:
-    - name: "1.4.2 | PATCH | Ensure permissions on bootloader config are configured"
+    - name: "1.4.2 | PATCH | Ensure permissions on bootloader config are configured | bios based system"
+      when: rhel9cis_legacy_boot
       ansible.builtin.file:
         path: "/boot/grub2/{{ item.path }}"
         owner: root
@@ -39,6 +40,32 @@
         modification_time: preserve
         access_time: preserve
       loop:
-        - { path: 'grub.cfg', mode: '0700' }
-        - { path: 'grubenv', mode: 'go-rwx' }
-        - { path: 'user.cfg', mode: 'go-rwx' }
+        - { path: 'grub.cfg', mode: 'u-x,go-rwx' }
+        - { path: 'grubenv', mode: 'u-x,go-rwx' }
+        - { path: 'user.cfg', mode: 'u-x,go-rwx' }
+
+    - name: "1.4.2 | PATCH | Ensure permissions on bootloader config are configured | efi based system"
+      when: not rhel9cis_legacy_boot
+      vars:
+        efi_mount_options: ['umask=0077', 'fmask=0077', 'uid=0', 'gid=0']
+      block:
+        - name: "1.4.2 | AUDIT | Ensure permissions on bootloader config are configured | efi based system | capture current state"
+          ansible.builtin.shell: grep "^[^#;]" /etc/fstab | grep '/boot/efi' | awk -F" " '{print $4}'
+          changed_when: false
+          check_mode: false
+          register: discovered_efi_fstab
+
+        - name: "1.4.2 | PATCH | Ensure permissions on bootloader config are configured | efi based system | Build Options"
+          when: item not in discovered_efi_fstab.stdout
+          ansible.builtin.set_fact:
+            efi_mount_opts_addition: "{{ efi_mount_opts_addition + ',' + item }}"
+          loop: "{{ efi_mount_options }}"
+
+        - name: "1.4.2 | PATCH | Ensure permissions on bootloader config are configured | efi based system | Add mount options"
+          when: efi_mount_opts_addition | length > 0
+          ansible.builtin.lineinfile:
+            path: /etc/fstab
+            regexp: (.*/boot/efi\s*\w*\s*){{ discovered_efi_fstab.stdout }}(.*)
+            line: \1{{ discovered_efi_fstab.stdout + efi_mount_opts_addition }}\2
+            backrefs: true
+          notify: Remount /boot/efi
diff --git a/tasks/section_1/cis_1.6.x.yml b/tasks/section_1/cis_1.6.x.yml
index c418324..8aace04 100644
--- a/tasks/section_1/cis_1.6.x.yml
+++ b/tasks/section_1/cis_1.6.x.yml
@@ -1,7 +1,9 @@
 ---
 
 - name: "1.6.1 | AUDIT | Ensure system-wide crypto policy is not legacy"
-  when: rhel9cis_rule_1_6_1
+  when:
+    - rhel9cis_rule_1_6_1
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -21,12 +23,14 @@
   tags:
     - level1-server
     - level1-workstation
+    - sshd
     - automated
     - patch
     - rule_1.6.2
     - NIST800-53R5_SC-8
     - NIST800-53R5_IA-5
-    - NIST800-53R5_AC-17- NIST800-53R5_SC-6
+    - NIST800-53R5_AC-17
+    - NIST800-53R5_SC-6
   ansible.builtin.lineinfile:
     path: /etc/sysconfig/sshd
     regexp: ^CRYPTO_POLICY\s*=
@@ -37,6 +41,7 @@
   when:
     - rhel9cis_rule_1_6_3
     - "'NO-SHA1' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -67,6 +72,7 @@
   when:
     - rhel9cis_rule_1_6_4
     - "'NO-WEAKMAC' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -76,7 +82,6 @@
     - rule_1.6.4
     - NIST800-53R5_SC-6
   block:
-
     - name: "1.6.4 | PATCH | Ensure system wide crypto policy disables macs less than 128 bits | Add submodule exclusion"
       ansible.builtin.template:
         src: etc/crypto-policies/policies/modules/NO-WEAKMAC.pmod.j2
@@ -98,6 +103,7 @@
   when:
     - rhel9cis_rule_1_6_5
     - "'NO-SSHCBC' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -128,6 +134,7 @@
   when:
     - rhel9cis_rule_1_6_6
     - "'NO-SSHWEAKCIPHERS' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -158,6 +165,7 @@
   when:
     - rhel9cis_rule_1_6_7
     - "'NO-SSHETM' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
diff --git a/tasks/section_1/main.yml b/tasks/section_1/main.yml
index 5d99f48..fff557b 100644
--- a/tasks/section_1/main.yml
+++ b/tasks/section_1/main.yml
@@ -41,7 +41,7 @@
     file: cis_1.2.2.x.yml
 
 - name: "SECTION | 1.3.1 | Configure SELinux"
-  ansible.builtin.include_tasks:
+  ansible.builtin.import_tasks:
     file: cis_1.3.1.x.yml
 
 - name: "SECTION | 1.4 | Configure Bootloader"
@@ -61,5 +61,6 @@
     file: cis_1.7.x.yml
 
 - name: "SECTION | 1.8 | Gnome Display Manager"
+  when: rhel9cis_display_manager == 'gdm'
   ansible.builtin.import_tasks:
     file: cis_1.8.x.yml
diff --git a/tasks/section_2/cis_2.1.x.yml b/tasks/section_2/cis_2.1.x.yml
index e49e733..28e372d 100644
--- a/tasks/section_2/cis_2.1.x.yml
+++ b/tasks/section_2/cis_2.1.x.yml
@@ -25,7 +25,7 @@
       when:
         - not rhel9cis_autofs_services
         - rhel9cis_autofs_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: autofs
         enabled: false
@@ -57,7 +57,7 @@
       when:
         - not rhel9cis_avahi_server
         - rhel9cis_avahi_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -90,7 +90,7 @@
       when:
         - not rhel9cis_dhcp_server
         - rhel9cis_dhcp_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -123,7 +123,7 @@
       when:
         - not rhel9cis_dns_server
         - rhel9cis_dns_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: named.service
         enabled: false
@@ -153,7 +153,7 @@
       when:
         - not rhel9cis_dnsmasq_server
         - rhel9cis_dnsmasq_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: dnsmasq.service
         enabled: false
@@ -184,7 +184,7 @@
       when:
         - not rhel9cis_samba_server
         - rhel9cis_samba_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: smb.service
         enabled: false
@@ -215,7 +215,7 @@
       when:
         - not rhel9cis_ftp_server
         - rhel9cis_ftp_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: vsftpd.service
         enabled: false
@@ -249,7 +249,7 @@
       when:
         - not rhel9cis_message_server
         - rhel9cis_message_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -285,7 +285,7 @@
       when:
         - not rhel9cis_nfs_server
         - rhel9cis_nfs_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: nfs-server.service
         enabled: false
@@ -302,7 +302,7 @@
     - nis
     - NIST800-53R5_CM-7
     - rule_2.1.10
-  notify: Systemd_daemon_reload
+  notify: Systemd daemon reload
   block:
     - name: "2.1.10 | PATCH | Ensure nis server services are not in use | Remove package"
       when:
@@ -344,7 +344,7 @@
       when:
         - not rhel9cis_print_server
         - rhel9cis_print_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -378,7 +378,7 @@
       when:
         - not rhel9cis_rpc_server
         - rhel9cis_rpc_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -412,7 +412,7 @@
       when:
         - not rhel9cis_rsync_server
         - rhel9cis_rsync_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -445,7 +445,7 @@
       when:
         - not rhel9cis_snmp_server
         - rhel9cis_snmp_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: snmpd.service
         enabled: false
@@ -476,7 +476,7 @@
       when:
         - not rhel9cis_telnet_server
         - rhel9cis_telnet_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: telnet.socket
         enabled: false
@@ -506,7 +506,7 @@
       when:
         - not rhel9cis_tftp_server
         - rhel9cis_tftp_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: "{{ item }}"
         enabled: false
@@ -540,7 +540,7 @@
       when:
         - not rhel9cis_squid_server
         - rhel9cis_squid_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: squid.service
         enabled: false
@@ -580,7 +580,7 @@
       when:
         - not rhel9cis_httpd_server
         - rhel9cis_httpd_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: httpd.service
         enabled: false
@@ -591,7 +591,7 @@
       when:
         - not rhel9cis_nginx_server
         - rhel9cis_nginx_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: ngnix.service
         enabled: false
@@ -621,7 +621,7 @@
       when:
         - not rhel9cis_xinetd_server
         - rhel9cis_xinetd_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: xinetd.service
         enabled: false
@@ -657,7 +657,7 @@
     - postfix
     - NIST800-53R5_CM-7
     - rule_2.1.21
-  notify: Restart_postfix
+  notify: Restart postfix
   ansible.builtin.lineinfile:
     path: /etc/postfix/main.cf
     regexp: "^(#)?inet_interfaces"
diff --git a/tasks/section_3/cis_3.1.x.yml b/tasks/section_3/cis_3.1.x.yml
index e8934d4..ff9ec46 100644
--- a/tasks/section_3/cis_3.1.x.yml
+++ b/tasks/section_3/cis_3.1.x.yml
@@ -16,15 +16,30 @@
     - rule_3.1.1
     - NIST800-53R5_CM-7
   block:
-    - name: "3.1.1 | PATCH | Ensure IPv6 status is identified | refresh"
+    - name: "3.1.1 | PATCH | Ensure IPv6 status is identified | Set vars for sysctl template"
+      when: "'sysctl' in rhel9cis_ipv6_disable_method"
       ansible.builtin.set_fact:
         rhel9cis_sysctl_update: true
         rhel9cis_flush_ipv6_route: true
 
-    - name: "3.1.1 | PATCH | Ensure IPv6 status is identified | disable"
+    - name: "3.1.1 | AUDIT | Ensure IPv6 status is identified | Message out implementation info"
+      when: "'sysctl' in rhel9cis_ipv6_disable_method"
       ansible.builtin.debug:
         msg: "Control being set via Handler 'update sysctl' which writes to /etc/sysctl.d/60-disable_ipv6.conf"
 
+    - name: "3.1.1 | AUDIT | Ensure IPv6 status is identified | Find IPv6 status"
+      when: "'kernel' in rhel9cis_ipv6_disable_method"
+      ansible.builtin.command: grubby --info=ALL
+      changed_when: false
+      failed_when: false
+      register: discovered_rhel9cis_3_1_1_ipv6_status
+
+    - name: "3.1.1 | PATCH | Ensure IPv6 status is identified | Disable IPV6 via Kernel"
+      when:
+        - "'kernel' in rhel9cis_ipv6_disable_method"
+        - "'ipv6.disable=1' not in discovered_rhel9cis_3_1_1_ipv6_status.stdout"
+      ansible.builtin.shell: grubby --update-kernel=ALL --args="ipv6.disable=1"
+
 - name: "3.1.2 | PATCH | Ensure wireless interfaces are disabled"
   when:
     - rhel9cis_rule_3_1_2
@@ -39,7 +54,7 @@
     warn_control_id: '3.1.2'
   block:
     - name: "3.1.2 | PATCH | Ensure wireless interfaces are disabled | Check for network-manager tool"
-      when: "'network-manager' in ansible_facts.packages"
+      when: "rhel9cis_network_manager_package_name in ansible_facts.packages"
       ansible.builtin.command: nmcli radio wifi
       changed_when: false
       failed_when: false
@@ -48,19 +63,19 @@
 
     - name: "3.1.2 | PATCH | Ensure wireless interfaces are disabled | Disable wireless if network-manager installed"
       when:
-        - "'network-manager' in ansible_facts.packages"
+        - "rhel9cis_network_manager_package_name in ansible_facts.packages"
         - "'enabled' in discovered_wifi_status.stdout"
       ansible.builtin.command: nmcli radio all off
       changed_when: discovered_nmcli_radio_off.rc == 0
       register: discovered_nmcli_radio_off
 
     - name: "3.1.2 | PATCH | Ensure wireless interfaces are disabled | Warn about wireless if network-manager not installed"
-      when: "'network-manager' not in ansible_facts.packages"
+      when: "rhel9cis_network_manager_package_name not in ansible_facts.packages"
       ansible.builtin.debug:
         msg: "Warning!! You need to disable wireless interfaces manually since network-manager is not installed"
 
     - name: "3.1.2 | PATCH | Ensure wireless interfaces are disabled | Set warning count"
-      when: "'network-manager' not in ansible_facts.packages"
+      when: "rhel9cis_network_manager_package_name not in ansible_facts.packages"
       ansible.builtin.import_tasks:
         file: warning_facts.yml
 
@@ -86,7 +101,7 @@
       when:
         - not rhel9cis_bluetooth_service
         - rhel9cis_bluetooth_mask
-      notify: Systemd_daemon_reload
+      notify: Systemd daemon reload
       ansible.builtin.systemd:
         name: bluetooth.service
         enabled: false
diff --git a/tasks/section_3/cis_3.2.x.yml b/tasks/section_3/cis_3.2.x.yml
index a49d907..415d966 100644
--- a/tasks/section_3/cis_3.2.x.yml
+++ b/tasks/section_3/cis_3.2.x.yml
@@ -25,8 +25,8 @@
     - name: "3.2.1 | PATCH | Ensure dccp kernel module is not available | blacklist"
       ansible.builtin.lineinfile:
         path: /etc/modprobe.d/blacklist.conf
-        regexp: "^(#)?blacklist cramfs(\\s|$)"
-        line: "blacklist cramfs"
+        regexp: "^(#)?blacklist dccp(\\s|$)"
+        line: "blacklist dccp"
         create: true
         mode: 'u-x,go-rwx'
 
diff --git a/tasks/section_3/cis_3.3.x.yml b/tasks/section_3/cis_3.3.x.yml
index 123928e..0281f12 100644
--- a/tasks/section_3/cis_3.3.x.yml
+++ b/tasks/section_3/cis_3.3.x.yml
@@ -240,12 +240,12 @@
     - rule_3.3.9
     - NIST800-53R5_AU-3
   block:
-    - name: "3.3.4 | PATCH | Ensure suspicious packets are logged | Set Fact"
+    - name: "3.3.9 | PATCH | Ensure suspicious packets are logged | Set Fact"
       ansible.builtin.set_fact:
         rhel9cis_sysctl_update: true
         rhel9cis_flush_ipv4_route: true
 
-    - name: "3.3.4 | PATCH | Ensure suspicious packets are logged"
+    - name: "3.3.9 | PATCH | Ensure suspicious packets are logged"
       ansible.builtin.debug:
         msg: "Control being set via Handler 'update sysctl' which writes to /etc/sysctl.d/60-netipv4_sysctl.conf"
 
diff --git a/tasks/section_4/cis_4.3.x.yml b/tasks/section_4/cis_4.3.x.yml
index 4e23998..4398df2 100644
--- a/tasks/section_4/cis_4.3.x.yml
+++ b/tasks/section_4/cis_4.3.x.yml
@@ -81,7 +81,7 @@
       register: discovered_nftables_inconnectionrule
 
     - name: "4.3.2 | AUDIT | Ensure nftables established connections are configured | Gather outbound connection rules"
-      ansible.builtin.command: nft list ruleset | awk '/hook output/,/}/' | grep -E 'ip protocol (tcp|udp|icmp) ct state'
+      ansible.builtin.shell: nft list ruleset | awk '/hook output/,/}/' | grep -E 'ip protocol (tcp|udp|icmp) ct state'
       changed_when: false
       failed_when: false
       register: discovered_nftables_outconnectionrule
diff --git a/tasks/section_5/cis_5.1.x.yml b/tasks/section_5/cis_5.1.x.yml
index 296ebf9..dc450ea 100644
--- a/tasks/section_5/cis_5.1.x.yml
+++ b/tasks/section_5/cis_5.1.x.yml
@@ -6,7 +6,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - permissions
     - rule_5.1.1
     - NIST800-53R5_AC-3
@@ -23,7 +23,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - permissions
     - rule_5.1.2
     - NIST800-53R5_AC-3
@@ -41,8 +41,8 @@
       ansible.builtin.file:
         path: "{{ item.path }}"
         owner: root
-        group: root
-        mode: 'u-x,go-rwx'
+        group: "{{ 'ssh_keys' if (item.gr_name == 'ssh_keys') else 'root' }}"
+        mode: "{{ 'u-x,g-wx,o-rwx' if (item.gr_name == 'ssh_keys') else 'u-x,go-rwx' }}"
       loop: "{{ discovered_ssh_private_host_key.files }}"
       loop_control:
         label: "{{ item.path }}"
@@ -53,7 +53,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.3
     - NIST800-53R5_AC-3
     - NIST800-53R5_MP-2
@@ -80,6 +80,7 @@
   when:
     - rhel9cis_rule_5_1_4
     - "'NO-SSHWEAKCIPHERS' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -108,6 +109,7 @@
   when:
     - rhel9cis_rule_5_1_5
     - "'NO-SHA1' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -136,6 +138,7 @@
   when:
     - rhel9cis_rule_5_1_6
     - "'NO-SSHWEAKMACS' not in rhel9cis_crypto_policy_module"
+    - rhel9cis_crypto_policy_ansiblemanaged
   tags:
     - level1-server
     - level1-workstation
@@ -166,7 +169,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.7
     - NIST800-53R5_AC-3
     - NIST800-53R5_MP-2
@@ -195,6 +198,8 @@
         path: "{{ rhel9cis_sshd_config_file }}"
         regexp: "^DenyUsers"
         line: "DenyUsers {{ rhel9cis_sshd_denyusers }}"
+        insertbefore: "^Match"
+        firstmatch: true
         validate: sshd -t -f %s
       notify: Restart sshd
 
@@ -213,7 +218,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.8
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -231,7 +236,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.9
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -261,7 +266,7 @@
     - level2-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.10
     - NIST800-53R5_CM-7
   block:
@@ -274,9 +279,10 @@
       notify: Restart sshd
 
     - name: "5.1.10 | PATCH | Ensure sshd DisableForwarding is enabled | override"
+      when: prelim_sshd_50_redhat_file.stat.exists
       ansible.builtin.lineinfile:
         path: /etc/ssh/sshd_config.d/50-redhat.conf
-        regexp: ^(?i)(#|)\s*X11Forwarding
+        regexp: (?i)^(#|)\s*X11Forwarding
         line: 'X11Forwarding {{ rhel9cis_sshd_x11forwarding }}'
         validate: sshd -t -f %s
       notify: Restart sshd
@@ -287,7 +293,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - sshs
+    - sshd
     - rule_5.1.11
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -296,9 +302,10 @@
     - NIST800-53R5_IA-5
   block:
     - name: "5.1.11 | PATCH | Ensure sshd GSSAPIAuthentication is disabled | redhat file"
+      when: prelim_sshd_50_redhat_file.stat.exists
       ansible.builtin.lineinfile:
         path: /etc/ssh/sshd_config.d/50-redhat.conf
-        regexp: ^(?i)(#|)\s*GSSAPIAuthentication
+        regexp: (?i)^(#|)\s*GSSAPIAuthentication
         line: GSSAPIAuthentication no
         validate: sshd -t -f %s
       notify: Restart sshd
@@ -306,7 +313,7 @@
     - name: "5.1.11 | PATCH | Ensure sshd GSSAPIAuthentication is disabled | ssh config"
       ansible.builtin.lineinfile:
         path: "{{ rhel9cis_sshd_config_file }}"
-        regexp: ^(?i)(#|)\s*GSSAPIAuthentication
+        regexp: (?i)^(#|)\s*GSSAPIAuthentication
         line: GSSAPIAuthentication no
         validate: sshd -t -f %s
       notify: Restart sshd
@@ -317,7 +324,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.12
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -326,7 +333,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*HostbasedAuthentication
+    regexp: (?i)^(#|)\s*HostbasedAuthentication
     line: 'HostbasedAuthentication no'
     validate: sshd -t -f %s
   notify: Restart sshd
@@ -337,7 +344,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.13
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -346,8 +353,10 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*IgnoreRhosts
+    regexp: (?i)^(#|)\s*IgnoreRhosts
     line: 'IgnoreRhosts yes'
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -357,13 +366,15 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.14
     - NIST800-53R5_CM-6
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*LoginGraceTime
+    regexp: (?i)^(#|)\s*LoginGraceTime
     line: "LoginGraceTime {{ rhel9cis_sshd_logingracetime }}"
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -373,15 +384,17 @@
     - level1-server
     - level1-workstation
     - patch
-    - sshs
+    - sshd
     - rule_5.1.15
     - NIST800-53R5_AU-3
     - NIST800-53R5_AU-12
     - NIST800-53R5_SI-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*LogLevel
+    regexp: (?i)^(#|)\s*LogLevel
     line: 'LogLevel {{ rhel9cis_ssh_loglevel }}'
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -391,7 +404,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.16
     - NIST800-53R5_AU-3
   ansible.builtin.lineinfile:
@@ -407,7 +420,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.17
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -416,7 +429,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*MaxStartups
+    regexp: (?i)^(#|)\s*MaxStartups
     line: 'MaxStartups {{ rhel9cis_ssh_maxstartups }}'
     validate: sshd -t -f %s
   notify: Restart sshd
@@ -427,7 +440,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.18
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -436,7 +449,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*MaxSessions
+    regexp: (?i)^(#|)\s*MaxSessions
     line: 'MaxSessions {{ rhel9cis_ssh_maxsessions }}'
     validate: sshd -t -f %s
   notify: Restart sshd
@@ -447,7 +460,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.19
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -456,7 +469,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*PermitEmptyPasswords
+    regexp: (?i)^(#|)\s*PermitEmptyPasswords
     line: 'PermitEmptyPasswords no'
     validate: sshd -t -f %s
   notify: Restart sshd
@@ -467,14 +480,14 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.20
     - NIST800-53R5_AC-6
   block:
     - name: "5.1.20 | PATCH | Ensure sshd PermitRootLogin is disabled | config file"
       ansible.builtin.lineinfile:
         path: "{{ rhel9cis_sshd_config_file }}"
-        regexp: ^(?i)(#|)\s*PermitRootLogin
+        regexp: (?i)^(#|)\s*PermitRootLogin
         line: 'PermitRootLogin no'
         validate: sshd -t -f %s
       notify: Restart sshd
@@ -491,7 +504,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.21
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -500,7 +513,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*PermitUserEnvironment
+    regexp: (?i)^(#|)\s*PermitUserEnvironment
     line: 'PermitUserEnvironment no'
     validate: sshd -t -f %s
   notify: Restart sshd
@@ -511,7 +524,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.22
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -520,7 +533,7 @@
     - NIST800-53R5_IA-5
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
-    regexp: ^(?i)(#|)\s*UsePAM
+    regexp: (?i)^(#|)\s*UsePAM
     line: 'UsePAM yes'
     validate: sshd -t -f %s
   notify: Restart sshd
diff --git a/tasks/section_5/cis_5.3.2.x.yml b/tasks/section_5/cis_5.3.2.x.yml
index eadb9b5..6e1919c 100644
--- a/tasks/section_5/cis_5.3.2.x.yml
+++ b/tasks/section_5/cis_5.3.2.x.yml
@@ -14,9 +14,7 @@
     - rule_5.3.2.1
   block:
     - name: "5.3.2.1 | PATCH | Ensure active authselect profile includes pam modules | Create custom profiles"
-      when:
-        - rhel9cis_authselect_custom_profile_name not in prelim_authselect_current_profile.stdout or
-          prelim_authselect_current_profile.stdout is not defined
+      when: rhel9cis_authselect_custom_profile_name not in prelim_authselect_current_profile.stdout
       ansible.builtin.command: "/usr/bin/authselect create-profile {{ rhel9cis_authselect_custom_profile_name }} -b {{ rhel9cis_authselect_default_profile_to_copy }}"
       changed_when: false
       args:
@@ -93,9 +91,15 @@
             insertafter: "{{ item.after | default(omit) }}"
             line: "{{ item.line }}"
           loop:
-            - { regexp: auth\s*required\s*pam_faillock.so preauth, after: auth\s*required\s*pam_env.so, line: "auth        required      pam_faillock.so preauth silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" }
-            - { regexp: auth\s*required\s*pam_faillock.so authfail, before: auth\s*required\s*pam_deny.so, line: "auth        required      pam_faillock.so authfail silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" }
-            - { regexp: account\s*required\s*pam_faillock.so, before: account\s*required\s*pam_unix.so, line: "account     required      pam_faillock.so" }
+            - regexp: "auth\\s+required\\s+pam_faillock.so\\s+preauth"
+              after:  "auth\\s+required\\s+pam_env.so" # yamllint disable-line rule:colons
+              line:   "auth        required      pam_faillock.so preauth silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" # yamllint disable-line rule:colons
+            - regexp: "auth\\s+required\\s+pam_faillock.so\\s+authfail"
+              before: "auth\\s+required\\s+pam_deny.so"
+              line:   "auth        required      pam_faillock.so authfail silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" # yamllint disable-line rule:colons
+            - regexp: "account\\s+required\\s+pam_faillock.so"
+              before: "account\\s+required\\s+pam_unix.so"
+              line:   "account     required      pam_faillock.so" # yamllint disable-line rule:colons
 
         - name: "5.3.2.2 | AUDIT | Ensure pam_faillock module is enabled | Add lines password-auth"
           when: not rhel9cis_allow_authselect_updates
@@ -106,9 +110,15 @@
             insertafter: "{{ item.after | default(omit) }}"
             line: "{{ item.line }}"
           loop:
-            - { regexp: auth\s*required\s*pam_faillock.so preauth, after: auth\s*required\s*pam_env.so, line: "auth        required      pam_faillock.so preauth silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" }
-            - { regexp: auth\s*required\s*pam_faillock.so authfail, before: auth\s*required\s*pam_deny.so, line: "auth        required      pam_faillock.so authfail silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" }
-            - { regexp: account\s*required\s*pam_faillock.so, before: account\s*required\s*pam_unix.so, line: "account     required      pam_faillock.so" }
+            - regexp: "auth\\s+required\\s+pam_faillock.so\\s+preauth"
+              after:  "auth\\s+required\\s+pam_env.so" # yamllint disable-line rule:colons
+              line:   "auth        required      pam_faillock.so preauth silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" # yamllint disable-line rule:colons
+            - regexp: "auth\\s+required\\s+pam_faillock.so\\s+authfail"
+              before: "auth\\s+required\\s+pam_deny.so"
+              line:   "auth        required      pam_faillock.so authfail silent deny=3 unlock_timeout={{ rhel9cis_pam_faillock_unlock_time }}" # yamllint disable-line rule:colons
+            - regexp: "account\\s+required\\s+pam_faillock.so"
+              before: "account\\s+required\\s+pam_unix.so"
+              line:   "account     required      pam_faillock.so" # yamllint disable-line rule:colons
 
 - name: "5.3.2.3 | PATCH | Ensure pam_pwquality module is enabled"
   when:
diff --git a/tasks/section_5/cis_5.3.3.1.x.yml b/tasks/section_5/cis_5.3.3.1.x.yml
index 1730521..0aadbe3 100644
--- a/tasks/section_5/cis_5.3.3.1.x.yml
+++ b/tasks/section_5/cis_5.3.3.1.x.yml
@@ -23,7 +23,7 @@
         - rhel9cis_disruption_high
       ansible.builtin.replace:
         path: "/etc/pam.d/{{ item }}-auth"
-        regexp: ^(\s*auth\s+(requisite|required|sufficient)\s+pam_faillock\.so)(.*)\s+deny\s*=\s*\S+(.*$)
+        regexp: ^(\s*auth\s+(?:requisite|required|sufficient)\s+pam_faillock\.so)(.*)\s+deny\s*=\s*\S+(.*$)
         replace: \1 \2\3
       loop:
         - password
diff --git a/tasks/section_5/cis_5.4.1.x.yml b/tasks/section_5/cis_5.4.1.x.yml
index 6a492e5..badca42 100644
--- a/tasks/section_5/cis_5.4.1.x.yml
+++ b/tasks/section_5/cis_5.4.1.x.yml
@@ -24,12 +24,13 @@
       ansible.builtin.shell: "awk -F: '(/^[^:]+:[^!*]/ && ($5> {{ rhel9cis_pass_max_days }} || $5< {{ rhel9cis_pass_max_days }} || $5 == -1)){print $1}' /etc/shadow"
       changed_when: false
       failed_when: false
+      check_mode: false
       register: discovered_max_days
 
     - name: "5.4.1.1 | PATCH | Ensure password expiration is 365 days or less | Set existing users PASS_MAX_DAYS"
       when:
         - discovered_max_days.stdout_lines | length > 0
-        - item in prelim_interactive_usernames.stdout
+        - item in prelim_interactive_users | map(attribute='username') | list
         - rhel9cis_force_user_maxdays
       ansible.builtin.user:
         name: "{{ item }}"
@@ -60,11 +61,11 @@
     - name: "5.4.1.2 | PATCH | Ensure minimum password days is configured | Set existing users PASS_MIN_DAYS"
       when:
         - discovered_min_days.stdout_lines | length > 0
-        - item in prelim_interactive_usernames.stdout
+        - item in prelim_interactive_users | map(attribute='username') | list
         - rhel9cis_force_user_mindays
       ansible.builtin.user:
         name: "{{ item }}"
-        password_expire_max: "{{ rhel9cis_pass_min_days }}"
+        password_expire_min: "{{ rhel9cis_pass_min_days }}"
       loop: "{{ discovered_min_days.stdout_lines }}"
 
 - name: "5.4.1.3 | PATCH | Ensure password expiration warning days is configured"
@@ -91,9 +92,9 @@
     - name: "5.4.1.3 | PATCH | Ensure password expiration warning days is configured | Set existing users WARN_DAYS"
       when:
         - discovered_warn_days.stdout_lines | length > 0
-        - item in prelim_interactive_usernames.stdout
+        - item in prelim_interactive_users | map(attribute='username') | list
         - rhel9cis_force_user_warnage
-      ansible.builtin.command: "chage --warndays {{ rhel9cis_pass['warn_age'] }} {{ item }}"
+      ansible.builtin.command: "chage --warndays {{ rhel9cis_pass_warn_age }} {{ item }}"
       changed_when: true
       loop: "{{ discovered_warn_days.stdout_lines }}"
 
@@ -140,7 +141,7 @@
       register: discovered_passwdlck_user_list
 
     - name: "5.4.1.5 | PATCH | Ensure inactive password lock is 30 days or less | Apply Inactive setting to existing accounts"
-      when: item in prelim_interactive_usernames.stdout
+      when: item in prelim_interactive_users |  map(attribute='username') | list
       ansible.builtin.command: chage --inactive {{ rhel9cis_inactivelock.lock_days }} "{{ item }}"
       changed_when: true
       loop: "{{ discovered_passwdlck_user_list.stdout_lines }}"
diff --git a/tasks/section_5/cis_5.4.2.x.yml b/tasks/section_5/cis_5.4.2.x.yml
index ef15f1a..b291cc2 100644
--- a/tasks/section_5/cis_5.4.2.x.yml
+++ b/tasks/section_5/cis_5.4.2.x.yml
@@ -61,7 +61,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - rule_5.4.2.2
+    - rule_5.4.2.3
     - user
     - system
     - NIST800-53R5_CM-1
@@ -135,6 +135,22 @@
       ansible.builtin.set_fact:
         root_paths: "{{ discovered_root_paths.stdout }}"
 
+    - name: "5.4.2.5 | AUDIT | Ensure root PATH Integrity | Check for presence of non-dirs"
+      ansible.builtin.stat:
+        path: "{{ item }}"
+      loop: "{{ discovered_root_paths_split.stdout_lines }}"
+      register: discovered_root_paths_stat
+
+    - name: "5.4.2.5 | AUDIT | Ensure root PATH Integrity | Create dirs for some paths that are not dirs"
+      ansible.builtin.file:
+        path: "{{ item.item }}"
+        state: directory
+        owner: root
+        group: root
+        mode: 'go-w'
+      loop: "{{ discovered_root_paths_stat.results }}"
+      when: not item.stat.exists
+
     - name: "5.4.2.5 | AUDIT | Ensure root PATH Integrity | Check for empty dirs"
       when: discovered_root_paths is defined
       ansible.builtin.shell: 'echo {{ root_paths }} | grep -q "::" && echo "roots path contains a empty directory (::)"'
@@ -190,12 +206,12 @@
     regexp: \s*umask
     line: "umask {{ rhel9cis_root_umask }}"
     create: true
-    mode: 'u+x,go-rwx'
+    mode: 'u-x,go-rwx'
 
 - name: "5.4.2.7 | PATCH | Ensure system accounts do not have a valid login shell"
   when:
     - rhel9cis_rule_5_4_2_7
-    - "item.id not in prelim_interactive_usernames.stdout"
+    - "item.id not in prelim_interactive_users | map(attribute='username')"
     - item.id not in rhel9cis_system_users_shell
     - "'root' not in item.id"
     - rhel9cis_disruption_high
@@ -212,7 +228,7 @@
   ansible.builtin.user:
     name: "{{ item.id }}"
     shell: /usr/sbin/nologin
-  loop: "{{ rhel9cis_passwd }}"
+  loop: "{{ prelim_captured_passwd_data }}"
   loop_control:
     label: "{{ item.id }}"
 
@@ -220,7 +236,7 @@
   when:
     - rhel9cis_rule_5_4_2_8
     - rhel9cis_disruption_high
-    - "item.id not in prelim_interactive_usernames.stdout"
+    - "item.id not in prelim_interactive_users | map(attribute='username')"
     - "'root' not in item.id"
   tags:
     - level1-server
@@ -235,6 +251,6 @@
   ansible.builtin.user:
     name: "{{ item.id }}"
     password_lock: true
-  loop: "{{ rhel9cis_passwd }}"
+  loop: "{{ prelim_captured_passwd_data }}"
   loop_control:
     label: "{{ item.id }}"
diff --git a/tasks/section_5/main.yml b/tasks/section_5/main.yml
index ae908ac..09a2fdd 100644
--- a/tasks/section_5/main.yml
+++ b/tasks/section_5/main.yml
@@ -5,45 +5,56 @@
 - name: "SECTION | 5.1 | Configure SSH Server"
   when:
     - "'openssh-server' in ansible_facts.packages"
+    - rhel9cis_section5_1
   ansible.builtin.import_tasks:
     file: cis_5.1.x.yml
 
 - name: "SECTION | 5.2 | Configure privilege escalation"
+  when:
+    - rhel9cis_section5_2
   ansible.builtin.import_tasks:
     file: cis_5.2.x.yml
 
-- name: "SECTION | 5.3.1.x | Configure PAM software packages"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.1.x.yml
+- name: "SECTION | 5.3"
+  when:
+    - rhel9cis_section5_3
+  block:
+    - name: "SECTION | 5.3.1.x | Configure PAM software packages"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.1.x.yml
 
-- name: "SECTION | 5.3.2.x | Configure authselect"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.2.x.yml
+    - name: "SECTION | 5.3.2.x | Configure authselect"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.2.x.yml
 
-- name: "SECTION | 5.3.3.1.x | Configure pam_faillock module"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.3.1.x.yml
+    - name: "SECTION | 5.3.3.1.x | Configure pam_faillock module"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.3.1.x.yml
 
-- name: "SECTION | 5.3.3.2.x | Configure pam_pwquality module"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.3.2.x.yml
+    - name: "SECTION | 5.3.3.2.x | Configure pam_pwquality module"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.3.2.x.yml
 
-- name: "SECTION | 5.3.3.3.x | Configure pam_pwhistory module"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.3.3.x.yml
+    - name: "SECTION | 5.3.3.3.x | Configure pam_pwhistory module"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.3.3.x.yml
 
-- name: "SECTION | 5.3.3.4.x | Configure pam_unix module"
-  ansible.builtin.import_tasks:
-    file: cis_5.3.3.4.x.yml
+    - name: "SECTION | 5.3.3.4.x | Configure pam_unix module"
+      ansible.builtin.import_tasks:
+        file: cis_5.3.3.4.x.yml
 
-- name: "SECTION | 5.4.1.x | Configure shadow password suite parameters"
-  ansible.builtin.import_tasks:
-    file: cis_5.4.1.x.yml
+- name: "SECTION | 5.4"
+  when:
+    - rhel9cis_section5_4
+  block:
+    - name: "SECTION | 5.4.1.x | Configure shadow password suite parameters"
+      ansible.builtin.import_tasks:
+        file: cis_5.4.1.x.yml
 
-- name: "SECTION | 5.4.2.x | Configure root and system accounts and environment"
-  ansible.builtin.import_tasks:
-    file: cis_5.4.2.x.yml
+    - name: "SECTION | 5.4.2.x | Configure root and system accounts and environment"
+      ansible.builtin.import_tasks:
+        file: cis_5.4.2.x.yml
 
-- name: "SECTION | 5.4.3.x | Configure user default environment"
-  ansible.builtin.import_tasks:
-    file: cis_5.4.3.x.yml
+    - name: "SECTION | 5.4.3.x | Configure user default environment"
+      ansible.builtin.import_tasks:
+        file: cis_5.4.3.x.yml
diff --git a/tasks/section_6/cis_6.1.x.yml b/tasks/section_6/cis_6.1.x.yml
index c000fe1..a29118a 100644
--- a/tasks/section_6/cis_6.1.x.yml
+++ b/tasks/section_6/cis_6.1.x.yml
@@ -58,6 +58,10 @@
             dest: /var/lib/aide/aide.db.gz
             remote_src: true
             mode: 'ug-wx,o-rwx'
+          register: aide_db_cp
+          failed_when:
+            - not ansible_check_mode
+            - aide_db_cp.failed
 
 - name: "6.1.2 | PATCH | Ensure filesystem integrity is regularly checked"
   when:
@@ -87,13 +91,13 @@
 
     - name: "6.1.2 | PATCH | Ensure filesystem integrity is regularly checked | aide service"
       when: rhel9cis_aide_scan == "timer"
-      ansible.builtin.systemd_service:
+      ansible.builtin.systemd:
         name: aidecheck.service
         enabled: true
 
     - name: "6.1.2 | PATCH | Ensure filesystem integrity is regularly checked | aide service"
       when: rhel9cis_aide_scan == "timer"
-      ansible.builtin.systemd_service:
+      ansible.builtin.systemd:
         name: aidecheck.timer
         state: started
         enabled: true
@@ -119,4 +123,7 @@
       /usr/sbin/aureport p+i+n+u+g+s+b+acl+xattrs+sha512
       /usr/sbin/ausearch p+i+n+u+g+s+b+acl+xattrs+sha512
       /usr/sbin/autrace p+i+n+u+g+s+b+acl+xattrs+sha512
-    validate: aide -D --config %s
+  register: aide_file_integrity_check
+  failed_when:
+    - not ansible_check_mode
+    - aide_file_integrity_check.failed
diff --git a/tasks/section_6/cis_6.2.1.x.yml b/tasks/section_6/cis_6.2.1.x.yml
index 3afa31c..fa75880 100644
--- a/tasks/section_6/cis_6.2.1.x.yml
+++ b/tasks/section_6/cis_6.2.1.x.yml
@@ -96,15 +96,20 @@
     - rule_6.2.1.4
   block:
     - name: "6.2.1.4 | PATCH | Ensure only one logging system is in use | when rsyslog"
-      when: rhel9cis_syslog == "rsyslog"
+      when:
+        - rhel9cis_syslog == "rsyslog"
+        - "'systemd-journald' in ansible_facts.packages"
       ansible.builtin.systemd:
         name: systemd-journald
         state: stopped
         enabled: false
 
     - name: "6.2.1.4 | PATCH | Ensure only one logging system is in use | when journald"
-      when: rhel9cis_syslog == "journald"
+      when:
+        - rhel9cis_syslog == "journald"
+        - "'rsyslog' in ansible_facts.packages"
       ansible.builtin.systemd:
         name: rsyslog
         state: stopped
         enabled: false
+      register: discovered_rsyslog_service
diff --git a/tasks/section_6/cis_6.2.2.1.x.yml b/tasks/section_6/cis_6.2.2.1.x.yml
index 00e949b..aa2415d 100644
--- a/tasks/section_6/cis_6.2.2.1.x.yml
+++ b/tasks/section_6/cis_6.2.2.1.x.yml
@@ -17,7 +17,7 @@
     name: systemd-journal-remote
     state: present
 
-- name: "6.2.2.1.2 | PATCH | Ensure systemd-journal-remote authentication is configured"
+- name: "6.2.2.1.2 | PATCH | Ensure systemd-journal-upload authentication is configured"
   when:
     - rhel9cis_rule_6_2_2_1_2
     - not rhel9cis_system_is_log_server
@@ -35,12 +35,12 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
   loop:
-    - { regexp: 'URL=', line: 'URL={{ rhel9cis_remote_log_server }}'}
+    - { regexp: 'URL=', line: 'URL={{ rhel9cis_journal_upload_url }}'}
     - { regexp: 'ServerKeyFile=', line: 'ServerKeyFile={{ rhel9cis_journal_upload_serverkeyfile }}'}
     - { regexp: 'ServerCertificateFile=', line: 'ServerCertificateFile={{ rhel9cis_journal_servercertificatefile }}'}
     - { regexp: 'TrustedCertificateFile=', line: 'TrustedCertificateFile={{ rhel9cis_journal_trustedcertificatefile }}'}
 
-- name: "6.2.2.1.3 | PATCH | Ensure systemd-journal-remote is enabled and active"
+- name: "6.2.2.1.3 | PATCH | Ensure systemd-journal-upload is enabled and active"
   when:
     - not rhel9cis_system_is_log_server
     - rhel9cis_rule_6_2_2_1_3
diff --git a/tasks/section_6/cis_6.2.2.x.yml b/tasks/section_6/cis_6.2.2.x.yml
index a57efe2..fe0f8c4 100644
--- a/tasks/section_6/cis_6.2.2.x.yml
+++ b/tasks/section_6/cis_6.2.2.x.yml
@@ -50,7 +50,7 @@
     - name: "6.2.2.3 | PATCH | Ensure journald Compress is configured | comment out current entries"
       ansible.builtin.replace:
         path: /etc/systemd/journald.conf
-        regexp: ^(?i)(\s*compress=)
+        regexp: (?i)(\s*compress=)
         replace: '#\1'
 
 - name: "6.2.2.4 | PATCH | Ensure journald Storage is configured"
@@ -76,5 +76,5 @@
     - name: "6.2.2.4 | PATCH | Ensure journald Storage is configured | comment out current entries"
       ansible.builtin.replace:
         path: /etc/systemd/journald.conf
-        regexp: ^(?i)(\s*storage=)
+        regexp: (?i)(\s*storage=)
         replace: '#\1'
diff --git a/tasks/section_6/cis_6.2.3.x.yml b/tasks/section_6/cis_6.2.3.x.yml
index 9333697..eaa3bd1 100644
--- a/tasks/section_6/cis_6.2.3.x.yml
+++ b/tasks/section_6/cis_6.2.3.x.yml
@@ -131,7 +131,7 @@
           *.=warning;*.=err                                        -/var/log/warn
           *.crit                                                   /var/log/warn
           *.*;mail.none;news.none                                  /var/log/messages
-        insertafter: '#### RULES ####'
+        insertbefore: '# ### sample forwarding rule ###'
       notify: Restart rsyslog
 
     - name: "6.2.3.5 | PATCH | Ensure logging is configured | Local log settings"
@@ -256,8 +256,8 @@
 
     - name: "6.2.3.8 | PATCH | Ensure logrotate is configured | set rsyslog conf"
       ansible.builtin.template:
-        src: etc/logrotate.d/rsyslog.conf.j2
-        dest: /etc/logrotate.d/rsyslog.conf
+        src: etc/logrotate.d/rsyslog_log.j2
+        dest: /etc/logrotate.d/rsyslog_log
         owner: root
         group: root
         mode: 'g-wx,o-rwx'
diff --git a/tasks/section_6/cis_6.2.4.1.yml b/tasks/section_6/cis_6.2.4.1.yml
index 814c46c..9e8b9b3 100644
--- a/tasks/section_6/cis_6.2.4.1.yml
+++ b/tasks/section_6/cis_6.2.4.1.yml
@@ -8,6 +8,8 @@
     - patch
     - logfiles
     - rule_6.2.4.1
+    - NIST800-53R5_AC-3
+    - NIST800-53R5_MP-2
   block:
     - name: "6.2.4.1 | AUDIT | Ensure access to all logfiles has been configured | find log files"
       ansible.builtin.shell: find /var/log/ -type f -exec ls {} \;
@@ -15,43 +17,35 @@
       failed_when: false
       register: discovered_logfiles
 
-    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions"
+    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions SSSD min 660"
       when:
         - discovered_logfiles.stdout_lines | length > 0
-        - ('audit.log' in item or 'journal' in item) or
-          item == '/var/log/secure' or
-          item == '/var/log/syslog' or
-          item == '/var/log/messages' or
-          item == '/var/log/auth.log'
+        - item is match("/var/log/(gdm|sssd)")
       ansible.builtin.file:
         path: "{{ item }}"
-        mode: 'u-x,g-wx,o-rwx'
+        mode: 'ug-x,o-rwx'
       failed_when: discovered_logfile_list.state not in '[ file, absent ]'
       register: discovered_logfile_list
       loop: "{{ discovered_logfiles.stdout_lines }}"
 
-    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions"
+    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions tmp min 664"
       when:
         - discovered_logfiles.stdout_lines | length > 0
-        - ('anaconda' in item or 'dnf' in item or 'secure' in item  or 'messages' in item or 'hawkey' in item)
-      ansible.builtin.file:
-        path: "{{ item }}"
-        mode: 'u-x,g-x,o-rwx'
-      failed_when: discovered_logfile_list.state not in '[ file, absent ]'
-      register: discovered_logfile_list
-      loop: "{{ discovered_logfiles.stdout_lines }}"
-
-    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions"
-      when:
-        - discovered_logfiles.stdout_lines | length > 0
-        - ('sssd' in item or 'lastlog' in item) or
-          item == "/var/log/btmp" or
-          item == "/var/log/utmp" or
-          item == "/var/log/wtmp" or
-          item == "/var/log/lastlog"
+        - item is match("/var/log/((u|b|w)tmp*|lastlog)")
       ansible.builtin.file:
         path: "{{ item }}"
         mode: 'ug-x,o-wx'
       failed_when: discovered_logfile_list.state not in '[ file, absent ]'
       register: discovered_logfile_list
       loop: "{{ discovered_logfiles.stdout_lines }}"
+
+    - name: "6.2.4.1 | PATCH | Ensure access to all logfiles has been configured | change permissions else all 640"
+      when:
+        - discovered_logfiles.stdout_lines | length > 0
+        - item is not match("/var/log/((u|b|w)tmp*|lastlog|sssd)")
+      ansible.builtin.file:
+        path: "{{ item }}"
+        mode: 'u-x,g-wx,o-rwx'
+      failed_when: discovered_logfile_list.state not in '[ file, absent ]'
+      register: discovered_logfile_list
+      loop: "{{ discovered_logfiles.stdout_lines }}"
diff --git a/tasks/section_6/cis_6.3.4.x.yml b/tasks/section_6/cis_6.3.4.x.yml
index 74de70a..b044abc 100644
--- a/tasks/section_6/cis_6.3.4.x.yml
+++ b/tasks/section_6/cis_6.3.4.x.yml
@@ -27,9 +27,9 @@
     - level2-workstation
     - patch
     - auditd
-    - rule_6.3.4.1
     - rule_6.3.4.2
     - rule_6.3.4.3
+    - rule_6.3.4.4
     - NIST800-53R5_AU-3
   ansible.builtin.file:
     path: "{{ prelim_auditd_logfile.stdout }}"
diff --git a/tasks/section_6/main.yml b/tasks/section_6/main.yml
index a1909dc..dbff078 100644
--- a/tasks/section_6/main.yml
+++ b/tasks/section_6/main.yml
@@ -5,6 +5,7 @@
     file: cis_6.1.x.yml
 
 - name: "SECTION | 6.2.1 | Configure systemd-journald service"
+  when: rhel9cis_syslog == 'journald'
   ansible.builtin.import_tasks:
     file: cis_6.2.1.x.yml
 
@@ -19,7 +20,9 @@
     file: cis_6.2.2.x.yml
 
 - name: "SECTION | 6.2.3 | Configure rsyslog"
-  when: rhel9cis_syslog == 'rsyslog'
+  when:
+    - rhel9cis_syslog == 'rsyslog'
+    - rhel9cis_rsyslog_ansiblemanaged
   ansible.builtin.import_tasks:
     file: cis_6.2.3.x.yml
 
diff --git a/tasks/section_7/cis_7.1.x.yml b/tasks/section_7/cis_7.1.x.yml
index 83c83a0..b23fb89 100644
--- a/tasks/section_7/cis_7.1.x.yml
+++ b/tasks/section_7/cis_7.1.x.yml
@@ -169,6 +169,8 @@
     owner: root
     group: root
     mode: 'u-x,go-wx'
+  failed_when: discovered_file_exists.state not in '[ file, absent ]'
+  register: discovered_file_exists
 
 - name: "7.1.11 | PATCH | Ensure world writable files and directories are secured"
   when:
diff --git a/tasks/section_7/cis_7.2.x.yml b/tasks/section_7/cis_7.2.x.yml
index cc1825c..debc9a6 100644
--- a/tasks/section_7/cis_7.2.x.yml
+++ b/tasks/section_7/cis_7.2.x.yml
@@ -220,7 +220,7 @@
     - name: "7.2.7 | AUDIT | Ensure no duplicate group names exist | Print warning about users with duplicate group names"
       when: discovered_group_check.stdout | length > 0
       ansible.builtin.debug:
-        msg: "Warning!! The following group names are duplicates: {{ discovered_group_group_check.stdout_lines }}"
+        msg: "Warning!! The following group names are duplicates: {{ discovered_group_check.stdout_lines }}"
 
     - name: "7.2.7 | AUDIT | Ensure no duplicate group names exist | Set warning count"
       when: discovered_group_check.stdout | length > 0
@@ -243,7 +243,7 @@
         state: directory
         owner: "{{ item.id }}"
         group: "{{ item.gid }}"
-      loop: "{{ rhel9cis_passwd | selectattr('uid', '>=', prelim_min_int_uid | int) | selectattr('uid', '<=', prelim_max_int_uid | int) | list }}"
+      loop: "{{ prelim_captured_passwd_data | selectattr('uid', '>=', prelim_min_int_uid | int) | selectattr('uid', '<=', prelim_max_int_uid | int) | list }}"
       loop_control:
         label: "{{ item.id }}"
 
@@ -256,7 +256,7 @@
         etype: group
         permissions: rx
         state: present
-      loop: "{{ prelim_interactive_users_home.stdout_lines }}"
+      loop: "{{ prelim_interactive_users | map(attribute='home') | list }}"
 
     - name: "7.2.8 | PATCH | Ensure local interactive user home directories are configured | Set other ACL"
       when: not system_is_container
@@ -266,7 +266,7 @@
         etype: other
         permissions: 0
         state: present
-      loop: "{{ prelim_interactive_users_home.stdout_lines }}"
+      loop: "{{ prelim_interactive_users | map(attribute='home') | list }}"
 
 - name: "7.2.9 | PATCH | Ensure local interactive user dot files access is configured"
   when:
@@ -286,8 +286,8 @@
   vars:
     warn_control_id: '7.2.9'
   block:
-    - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Check for files"
-      ansible.builtin.shell: find /home/ -name "\.*"
+    - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured"
+      ansible.builtin.shell: find {{ prelim_interactive_users_home.stdout_lines | list | join(' ') }} -name "\.*" -type f
       changed_when: false
       failed_when: discovered_homedir_hidden_files.rc not in [ 0, 1 ]
       check_mode: false
@@ -296,25 +296,63 @@
     - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Warning on files found"
       when:
         - discovered_homedir_hidden_files.stdout | length > 0
-        - rhel9cis_dotperm_ansiblemanaged
+        - not rhel9cis_dotperm_ansiblemanaged
       ansible.builtin.debug:
         msg:
-          - "Warning!! We have discovered group or world-writable dot files on your system and this host is configured for manual intervention. Please investigate these files further."
+          - "Warning!! Please investigate that hidden files found in users home directories match control requirements."
 
-    - name: "7.2.9 | PATCH | Ensure local interactive user dot files access is configured | Set warning count"
+    - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Set warning count"
       when:
         - discovered_homedir_hidden_files.stdout | length > 0
-        - rhel9cis_dotperm_ansiblemanaged
+        - not rhel9cis_dotperm_ansiblemanaged
       ansible.builtin.import_tasks:
         file: warning_facts.yml
 
-    - name: "7.2.9 | PATCH | Ensure local interactive user dot files access is configured | Changes files if configured"
+    - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured"
       when:
         - discovered_homedir_hidden_files.stdout | length > 0
         - rhel9cis_dotperm_ansiblemanaged
-      ansible.builtin.file:
-        path: '{{ item }}'
-        mode: 'go-w'
-        owner: "{{ rhel9cis_passwd | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='uid') | last }}"
-        group: "{{ rhel9cis_passwd | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='gid') | last }}"
-      with_items: "{{ discovered_homedir_hidden_files.stdout_lines }}"
+      block:
+        - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Changes files if configured .bash_history & .netrc"
+          when:
+            - discovered_homedir_hidden_files.stdout | length > 0
+            - item | basename in ['.bash_history','.netrc']
+          ansible.builtin.file:
+            path: "{{ item }}"
+            mode: 'u-x,go-rwx'
+          failed_when: discovered_dot_bash_history_to_change.state not in '[ file, absent ]'
+          register: discovered_dot_bash_history_to_change
+          loop: "{{ discovered_homedir_hidden_files.stdout_lines }}"
+
+        - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Changes files if configured file mode"
+          ansible.builtin.file:
+            path: '{{ item }}'
+            mode: 'u-x,go-wx'
+          failed_when: discovered_dot_bash_history_to_change.state not in '[ file, absent ]'
+          register: discovered_dot_bash_history_to_change
+          loop: "{{ discovered_homedir_hidden_files.stdout_lines }}"
+
+        - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | Changes files ownerships"
+          ansible.builtin.file:
+            path: "{{ item }}"
+            owner: "{{ prelim_captured_passwd_data | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='uid') | last }}"
+            group: "{{ prelim_captured_passwd_data | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='gid') | last }}"
+          failed_when: discovered_dot_bash_history_to_change.state not in '[ file, absent ]'
+          register: discovered_dot_bash_history_to_change
+          loop: "{{ discovered_homedir_hidden_files.stdout_lines }}"
+
+        - name: "7.2.9 | PATCH | Ensure local interactive user dot files access is configured | Changes files if configured"
+          ansible.builtin.file:
+            path: '{{ item }}'
+            mode: 'go-w'
+            owner: "{{ prelim_captured_passwd_data | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='uid') | last }}"
+            group: "{{ prelim_captured_passwd_data | selectattr('dir', 'in', prelim_interactive_users_home.stdout_lines) | selectattr('dir', 'in', item) | map(attribute='gid') | last }}"
+          with_items: "{{ discovered_homedir_hidden_files.stdout_lines }}"
+
+        - name: "7.2.9 | AUDIT | Ensure local interactive user dot files access is configured | rename .forward or .rhosts files"
+          when:
+            - item | basename in ['.forward','.rhosts']
+            - item is not search ("CIS")
+          ansible.builtin.command: "mv {{ item }} {{ item }}_CIS_TOBEREVIEWED"
+          changed_when: true
+          loop: "{{ discovered_homedir_hidden_files.stdout_lines }}"
diff --git a/templates/ansible_vars_goss.yml.j2 b/templates/ansible_vars_goss.yml.j2
index ad44fb3..cbaa125 100644
--- a/templates/ansible_vars_goss.yml.j2
+++ b/templates/ansible_vars_goss.yml.j2
@@ -34,10 +34,10 @@ rhel9cis_selinux_disable: {{ rhel9cis_selinux_disable }}
 # UEFI boot('/etc/grub2-efi.cfg') or in case of BIOS legacy-boot('/etc/grub2.cfg').
 rhel9cis_legacy_boot: {{ rhel9cis_legacy_boot }}
 
-## Benchmark name used by audting control role
+## Benchmark name used by auditing control role
 # The audit variable found at the base
 ## metadata for Audit benchmark
-benchmark_version: 'v2.0.0'
+benchmark_version: {{ benchmark_version }}
 
 benchmark: RHEL9-CIS
 
@@ -151,7 +151,7 @@ rhel9cis_rule_1_8_8: {{ rhel9cis_rule_1_8_8 }}
 rhel9cis_rule_1_8_9: {{ rhel9cis_rule_1_8_9 }}
 rhel9cis_rule_1_8_10: {{ rhel9cis_rule_1_8_10 }}
 
-# Section 2 rules are controling Services (Special Purpose Services, and service clients)
+# Section 2 rules are controlling Services (Special Purpose Services, and service clients)
 ## Configure Server Services
 rhel9cis_rule_2_1_1: {{ rhel9cis_rule_2_1_1 }}
 rhel9cis_rule_2_1_2: {{ rhel9cis_rule_2_1_2 }}
@@ -625,21 +625,21 @@ rhel9cis_authselect_custom_profile_name: {{ rhel9cis_authselect_custom_profile_n
 # These are discovered via logins.def if set true
 rhel9cis_discover_int_uid: {{ rhel9cis_discover_int_uid }}
 # This variable sets the minimum number from which to search for UID
-# Note that the value will be dynamically overwritten if variable `dicover_int_uid` has
+# Note that the value will be dynamically overwritten if variable `discover_int_uid` has
 # been set to `true`.
 min_int_uid: 1000
 ### Controls:
 # - Ensure local interactive user home directories exist
 # - Ensure local interactive users own their home directories
 # This variable sets the maximum number at which the search stops for UID
-# Note that the value will be dynamically overwritten if variable `dicover_int_uid` has
+# Note that the value will be dynamically overwritten if variable `discover_int_uid` has
 # been set to `true`.
 max_int_uid: 65533
 
 ## Section6 vars
 
 ## Control 6.1.2 AIDE schedule
-# how aide sceduler runs can be one of cron or timer
+# how aide scheduler runs can be one of cron or timer
 rhel9cis_aide_scan: {{ rhel9cis_aide_scan }}
 
 # These are the crontab settings for periodical checking of the filesystem's integrity using AIDE.
diff --git a/templates/audit/99_auditd.rules.j2 b/templates/audit/99_auditd.rules.j2
index b9e632c..c3c2b6c 100644
--- a/templates/audit/99_auditd.rules.j2
+++ b/templates/audit/99_auditd.rules.j2
@@ -10,12 +10,7 @@
 {% endif %}
 {% if rhel9cis_rule_6_3_3_2 %}
 {% set syscalls = ["execve"] %}
-{% set arch_syscalls = [] %}
-{%- for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor -%}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -C euid!=uid -F auid!=unset -S {{ arch_syscalls|join(',') }} -k user_emulation
 -a always,exit -F arch=b32 -C euid!=uid -F auid!=unset -S {{ arch_syscalls|join(',') }} -k user_emulation
 {% endif %}
@@ -23,31 +18,28 @@
 -w {{ rhel9cis_sudolog_location }} -p wa -k sudo_log_file
 {% endif %}
 {% if rhel9cis_rule_6_3_3_4 %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set syscalls = ["adjtimex","settimeofday"]  %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -k time-change
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -k time-change
+{% set syscalls = ["clock_settime"] %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
+-a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F a0=0x0 -k time-change
+-a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F a0=0x0 -k time-change
 -w /etc/localtime -p wa -k time-change
 {% endif %}
 {% if rhel9cis_rule_6_3_3_5 %}
 {% set syscalls = ["sethostname","setdomainname"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
--a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }}  -k system-locale
--a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }}  -k system-locale
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
+-a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -k system-locale
+-a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -k system-locale
 -w /etc/issue -p wa -k system-locale
 -w /etc/issue.net -p wa -k system-locale
 -w /etc/hosts -p wa -k system-locale
+-w /etc/hostname -p wa -k system-locale
 -w /etc/sysconfig/network -p wa -k system-locale
 -w /etc/sysconfig/network-scripts -p wa -k system-locale
+-w /etc/NetworkManager -p wa -k system-locale
 {% endif %}
 {% if rhel9cis_rule_6_3_3_6 %}
 {% for proc in discovered_priv_procs.stdout_lines -%}
@@ -56,12 +48,7 @@
 {% endif %}
 {% if rhel9cis_rule_6_3_3_7 %}
 {% set syscalls = ["creat","open","openat","truncate","ftruncate"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F exit=-EACCES -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k access
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F exit=-EPERM -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k access
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F exit=-EACCES -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k access
@@ -79,62 +66,27 @@
 {% endif %}
 {% if rhel9cis_rule_6_3_3_9 %}
 {% set syscalls = ["chmod","fchmod","fchmodat"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% set syscalls = ["chown","fchown","lchown","fchownat"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% set syscalls = ["setxattr","lsetxattr","fsetxattr","removexattr","lremovexattr","fremovexattr"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% set syscalls = ["chmod","fchmod","fchmodat"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% set syscalls = ["chown","fchown","lchown","fchownat"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% set syscalls = ["setxattr","lsetxattr","fsetxattr","removexattr","lremovexattr","fremovexattr"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_mod
 {% endif %}
 {% if rhel9cis_rule_6_3_3_10 %}
 {% set syscalls = ["mount"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append(syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k mounts
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k mounts
 {% endif %}
@@ -149,12 +101,7 @@
 {% endif %}
 {% if rhel9cis_rule_6_3_3_13 %}
 {% set syscalls = ["unlink","unlinkat","rename","renameat"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append( syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k delete
 -a always,exit -F arch=b32 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k delete
 {% endif %}
@@ -169,7 +116,7 @@
 -a always,exit -F path=/usr/bin/setfacl -F perm=x -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_chng
 {% endif %}
 {% if rhel9cis_rule_6_3_3_17 %}
--a always,exit -F path=/usr/bin/chacl -F perm=x -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k priv_chng
+-a always,exit -F path=/usr/bin/chacl -F perm=x -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k perm_chng
 {% endif %}
 {% if rhel9cis_rule_6_3_3_18 %}
 -a always,exit -F path=/usr/sbin/usermod -F perm=x -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k usermod
@@ -177,12 +124,7 @@
 {% if rhel9cis_rule_6_3_3_19 %}
 -a always,exit -F path=/usr/bin/kmod -F perm=x -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k kernel_modules
 {% set syscalls = ["init_module","finit_module","delete_module","create_module","query_module"] %}
-{% set arch_syscalls = [] %}
-{% for syscall in syscalls  %}
-{% if syscall in supported_syscalls %}
-{{ arch_syscalls.append( syscall) }}
-{% endif %}
-{% endfor %}
+{% set arch_syscalls = syscalls | select("in", supported_syscalls) | list %}
 -a always,exit -F arch=b64 -S {{ arch_syscalls|join(',') }} -F auid>={{ prelim_min_int_uid }} -F auid!=unset -k kernel_modules
 {% endif %}
 {% if rhel9cis_rule_6_3_3_20 %}
diff --git a/templates/etc/ansible/compliance_facts.j2 b/templates/etc/ansible/compliance_facts.j2
new file mode 100644
index 0000000..f8725e1
--- /dev/null
+++ b/templates/etc/ansible/compliance_facts.j2
@@ -0,0 +1,40 @@
+# CIS Hardening Carried out
+# Added as part of ansible-lockdown CIS baseline
+# provided by Mindpoint Group - A Tyto Athene Company
+
+[lockdown_details]
+# Benchmark release
+Benchmark_release = CIS-{{ benchmark_version }}
+Benchmark_run_date = {{ '%Y-%m-%d - %H:%M:%S' | ansible.builtin.strftime }}
+# If options set (doesn't mean it ran all controls)
+level_1_hardening_enabled = {{ rhel9cis_level_1 }}
+level_2_hardening_enabled = {{ rhel9cis_level_2 }}
+
+{% if ansible_run_tags | length > 0 %}
+# If tags used to stipulate run level
+{% if 'level1-server' in ansible_run_tags %}
+Level_1_Server_tag_run = true
+{% endif %}
+{% if 'level2-server' in ansible_run_tags %}
+Level_2_Server_tag_run = true
+{% endif %}
+{% if 'level1-workstation' in ansible_run_tags %}
+Level_1_workstation_tag_run = true
+{% endif %}
+{% if 'level2-workstation' in ansible_run_tags %}
+Level_2_workstation_tag_run = true
+{% endif %}
+{% endif %}
+
+[lockdown_audit_details]
+{% if run_audit %}
+# Audit run
+audit_run_date = {{ '%Y-%m-%d - %H:%M:%S' | ansible.builtin.strftime }}
+audit_file_local_location = {{ audit_log_dir }}
+{% if not audit_only %}
+audit_summary = {{ post_audit_results }}
+{% endif %}
+{% if fetch_audit_output %}
+audit_files_centralized_location = {{ audit_output_destination }}
+{% endif %}
+{% endif %}
diff --git a/templates/etc/crypto-policies/policies/modules/NO-SSHWEAKCIPHERS.pmod.j2 b/templates/etc/crypto-policies/policies/modules/NO-SSHWEAKCIPHERS.pmod.j2
index d325a11..393cf88 100644
--- a/templates/etc/crypto-policies/policies/modules/NO-SSHWEAKCIPHERS.pmod.j2
+++ b/templates/etc/crypto-policies/policies/modules/NO-SSHWEAKCIPHERS.pmod.j2
@@ -1,4 +1,4 @@
 # This is a subpolicy to disable weak ciphers
 # for the SSH protocol (libssh and OpenSSH)
 # Carried out as part of CIS Benchmark rules combined 1.6.6 and 5.1.4
-cipher@SSH ={% if rhel9cis_rule_1_6_6 %} -CHACHA20-POLY1305{% endif %}{% if rhel9cis_rule_5_1_5 %} -3DES-CBC -AES-128-CBC -AES-192-CBC -AES-256-CBC{% endif %}
+cipher@SSH ={% if rhel9cis_rule_1_6_6 %} -CHACHA20-POLY1305{% endif %}{% if rhel9cis_rule_5_1_4 %} -3DES-CBC -AES-128-CBC -AES-192-CBC -AES-256-CBC{% endif %}
diff --git a/templates/etc/dconf/db/gdm.d/01-banner-message.j2 b/templates/etc/dconf/db/gdm.d/01-banner-message.j2
index 901e9e0..ec42bfc 100644
--- a/templates/etc/dconf/db/gdm.d/01-banner-message.j2
+++ b/templates/etc/dconf/db/gdm.d/01-banner-message.j2
@@ -4,4 +4,4 @@
 
 [org/gnome/login-screen]
 banner-message-enable=true
-banner-message-text="{{ rhel9cis_warning_banner }}"
+banner-message-text="{{ rhel9cis_warning_banner | trim | replace("\n", "\\n") }}"
diff --git a/templates/etc/logrotate.d/rsyslog.conf.j2 b/templates/etc/logrotate.d/rsyslog.conf.j2
deleted file mode 100644
index 2423b24..0000000
--- a/templates/etc/logrotate.d/rsyslog.conf.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/rsyslog/*.log {
-    {{ rhel9cis_rsyslog_logrotate_rotated }}
-    rotate {{ rhel9cis_rsyslog_logrotate_keep }}
-    {% if rhel9cis_rsyslog_logrotate_compress %}compress{% else %}nocompress{% endif %}
-    {% if rhel9cis_rsyslog_logrotate_missingok %}missingok{% else %}missingok{% endif %}
-    {% if rhel9cis_rsyslog_logrotate_notifempty %}notifempty{% else %}ifempty{% endif %}
-    {% if rhel9cis_rsyslog_logrotate_create %}create {{ rhel9cis_rsyslog_logrotate_create_opts }}{% endif %}
-    postrotate
-        /usr/bin/systemctl reload rsyslog.service >/dev/null || true
-    endscript
-}
diff --git a/templates/etc/logrotate.d/rsyslog_log.j2 b/templates/etc/logrotate.d/rsyslog_log.j2
new file mode 100644
index 0000000..8acb53e
--- /dev/null
+++ b/templates/etc/logrotate.d/rsyslog_log.j2
@@ -0,0 +1,26 @@
+/var/log/rsyslog/*.log {
+    {{ rhel9cis_rsyslog_logrotate_rotated_when }}
+    rotate {{ rhel9cis_rsyslog_logrotate_rotatation_keep }}
+{% if rhel9cis_rsyslog_logrotate_compress %}
+    compress
+{% else %}
+    nocompress
+{% endif %}
+{% if rhel9cis_rsyslog_logrotate_missingok %}
+    missingok
+{% else %}
+    nomissingok
+{% endif %}
+{% if rhel9cis_rsyslog_logrotate_notifempty %}
+    notifempty
+{% else %}
+    ifempty
+{% endif %}
+{% if rhel9cis_rsyslog_logrotate_create %}
+    create{% if rhel9cis_rsyslog_logrotate_create_opts is defined %} {{ rhel9cis_rsyslog_logrotate_create_opts }}{% endif %}
+{% endif %}
+
+    postrotate
+        /usr/bin/systemctl reload rsyslog.service >/dev/null || true
+    endscript
+}
diff --git a/templates/etc/sysctl.d/60-disable_ipv6.conf.j2 b/templates/etc/sysctl.d/60-disable_ipv6.conf.j2
index bdded40..b4b5318 100644
--- a/templates/etc/sysctl.d/60-disable_ipv6.conf.j2
+++ b/templates/etc/sysctl.d/60-disable_ipv6.conf.j2
@@ -4,4 +4,7 @@
 {% if rhel9cis_rule_3_1_1 and not rhel9cis_ipv6_required %}
 net.ipv6.conf.all.disable_ipv6 = 1
 net.ipv6.conf.default.disable_ipv6 = 1
+{% for interface in ansible_interfaces %}
+net.ipv6.conf.{{ interface }}.disable_ipv6 = 1
+{% endfor %}
 {% endif %}
diff --git a/vars/main.yml b/vars/main.yml
index c1d0fb3..9337d58 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -7,10 +7,16 @@ rhel9cis_allowed_crypto_policies:
   - 'FUTURE'
   - 'FIPS'
 
+# Following is left blank for ability to build string
+rhel9cis_crypto_policy_module: ''
+
+# Do not adjust these are recognized as part of the CIS benchmark and used during testing
 rhel9cis_allowed_crypto_policies_modules:
+  # Recognized by CIS as possible extra options
   - 'OSPP'
   - 'AD-SUPPORT'
   - 'AD-SUPPORT-LEGACY'
+  # The following are already included in 1.6.x controls
   - 'NO-SHA1'
   - 'NO-SSHCBC'
   - 'NO-SSHETM'
@@ -22,6 +28,12 @@ rhel9cis_allowed_crypto_policies_modules:
 warn_control_list: ""
 warn_count: 0
 
+# list of dicts of interactive users, filled in during prelim.yml
+prelim_interactive_users: []
+
+# Default empty values for 1.4.2
+efi_mount_opts_addition: ''
+
 gpg_key_package: "{{ ansible_facts.distribution | lower }}-gpg-keys"
 
 ## Controls 6.3.3.x - Audit template