diff --git a/tasks/rhel6stig/apt.yml b/tasks/rhel6stig/apt.yml
index d7f8e48a..be5d4837 100644
--- a/tasks/rhel6stig/apt.yml
+++ b/tasks/rhel6stig/apt.yml
@@ -104,15 +104,10 @@
 
 - name: Add or remove packages based on STIG requirements
   apt:
-    name: |
-      {%- set pkg_list = [] %}
-      {%- for package_dict in item[1] %}
-      {%- if pkg_list.extend(package_dict.packages) %}{% endif %}
-      {%- endfor %}
-      {{ pkg_list }}
-    state: "{{ item[0] }}"
+    name: "{{ stig_packages | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
+    state: "{{ item }}"
   with_items:
-    - "{{ stig_packages | selectattr('enabled') | groupby('state') }}"
+    - "{{ stig_packages | selectattr('enabled') | map(attribute='state') | unique | list }}"
   tags:
     - cat1
     - auth
diff --git a/tasks/rhel6stig/rpm.yml b/tasks/rhel6stig/rpm.yml
index 96c6dbeb..03b6d8fa 100644
--- a/tasks/rhel6stig/rpm.yml
+++ b/tasks/rhel6stig/rpm.yml
@@ -100,15 +100,10 @@
 
 - name: Add or remove packages based on STIG requirements
   yum:
-    name: |
-      {%- set pkg_list = [] %}
-      {%- for package_dict in item[1] %}
-      {%- if pkg_list.extend(package_dict.packages) %}{% endif %}
-      {%- endfor %}
-      {{ pkg_list }}
-    state: "{{ item[0] }}"
+    name: "{{ stig_packages | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
+    state: "{{ item }}"
   with_items:
-    - "{{ stig_packages | selectattr('enabled') | groupby('state') }}"
+    - "{{ stig_packages | selectattr('enabled') | map(attribute='state') | unique | list }}"
   tags:
     - cat1
     - auth
diff --git a/tasks/rhel7stig/packages.yml b/tasks/rhel7stig/packages.yml
index 9a21bbd5..7504e2be 100644
--- a/tasks/rhel7stig/packages.yml
+++ b/tasks/rhel7stig/packages.yml
@@ -15,15 +15,10 @@
 
 - name: Add or remove packages based on STIG requirements
   package:
-    name: |
-      {%- set pkg_list = [] %}
-      {%- for package_dict in item[1] %}
-      {%- if pkg_list.extend(package_dict.packages) %}{% endif %}
-      {%- endfor %}
-      {{ pkg_list }}
-    state: "{{ item[0] }}"
+    name: "{{ stig_packages_rhel7 | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
+    state: "{{ item }}"
   with_items:
-    - "{{ stig_packages_rhel7 | selectattr('enabled') | groupby('state') }}"
+    - "{{ stig_packages_rhel7 | selectattr('enabled') | map(attribute='state') | unique | list }}"
   tags:
     - cat1
     - auth