diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 7dcc362..8827640 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -21,6 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: USE_PYTHON=python3.9 ./.github/workflows/run-pc.sh
+    - run: USE_PYTHON=python3.10 ./.github/workflows/run-pc.sh
       shell: bash
 
diff --git a/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml b/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml
index d581477..8a1f609 100644
--- a/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml
+++ b/collections/ansible_collections/demo/cloud/roles/aws/tasks/snapshot_vm.yml
@@ -23,7 +23,7 @@
       loop_control:
         loop_var: volume
         label: "{{ volume.id }}"
-      register: r_snapshots
+      register: aws_r_snapshots
       amazon.aws.ec2_snapshot:
         region: "{{ aws_region }}"
         volume_id: "{{ volume.id }}"
@@ -34,7 +34,7 @@
   ansible.builtin.set_fact:
     aws_snapshot_stat:
       - key: "{{ inventory_hostname }}"
-        value: "{{ r_snapshots.results | json_query(aws_ec2_snapshot_query) }}"
+        value: "{{ aws_r_snapshots.results | json_query(aws_ec2_snapshot_query) }}"
 
 - name: AWS | SNAPSHOT VM | record snapshot with host key
   ansible.builtin.set_stats:
diff --git a/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml b/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml
index 8d4fdd0..1b531af 100644
--- a/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml
+++ b/collections/ansible_collections/demo/openshift/roles/snapshot/tasks/create.yml
@@ -29,7 +29,7 @@
     wait: true
     wait_condition:
       type: Ready
-  register: snapshot
+  register: snapshot_snapshot
 
 - name: Start VirtualMachine
   redhat.openshift_virtualization.kubevirt_vm:
@@ -42,8 +42,8 @@
 - name: Export snapshot name
   ansible.builtin.set_stats:
     data:
-      restore_snapshot_name: "{{ snapshot.result.metadata.name }}"
+      restore_snapshot_name: "{{ snapshot_snapshot.result.metadata.name }}"
 
 - name: Output snapshot name
   ansible.builtin.debug:
-    msg: "Successfully created snapshot {{ snapshot.result.metadata.name }}"
+    msg: "Successfully created snapshot {{ snapshot_snapshot.result.metadata.name }}"
diff --git a/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml b/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
index a898785..6c46c60 100644
--- a/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
+++ b/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
@@ -8,7 +8,7 @@
   check_mode: false
 
 - name: Upgrade packages (yum)
-  ansible.builtin.yum:
+  ansible.legacy.dnf:
     name: '*'
     state: latest  # noqa: package-latest - Intended to update packages to latest
     exclude: "{{ exclude_packages }}"
@@ -25,13 +25,13 @@
 
 - name: Check to see if we need a reboot
   ansible.builtin.command: needs-restarting -r
-  register: result
-  changed_when: result.rc == 1
-  failed_when: result.rc > 1
+  register: patch_linux_result
+  changed_when: patch_linux_result.rc == 1
+  failed_when: patch_linux_result.rc > 1
   check_mode: false
 
 - name: Reboot Server if Necessary
   ansible.builtin.reboot:
   when:
-    - result.rc == 1
+    - patch_linux_result.rc == 1
     - allow_reboot
diff --git a/collections/ansible_collections/demo/satellite/roles/scap_client/tasks/main.yaml b/collections/ansible_collections/demo/satellite/roles/scap_client/tasks/main.yaml
index 19a33db..9bda086 100644
--- a/collections/ansible_collections/demo/satellite/roles/scap_client/tasks/main.yaml
+++ b/collections/ansible_collections/demo/satellite/roles/scap_client/tasks/main.yaml
@@ -20,7 +20,7 @@
 
 - name: Build policy {{ policy_name }}
   ansible.builtin.set_fact:
-    policy: "{{ policy | default([]) }} + {{ [item] }}"
+    scap_client_policy: "{{ scap_client_policy | default([]) }} + {{ [item] }}"
   loop: "{{ scap_client_policies.json.results }}"
   when: item.name in policy_name or policy_name == 'all'