diff --git a/tasks/rhel7stig/packages.yml b/tasks/rhel7stig/packages.yml
index c6b1e990..cfcab731 100644
--- a/tasks/rhel7stig/packages.yml
+++ b/tasks/rhel7stig/packages.yml
@@ -23,7 +23,7 @@
       {{ pkg_list }}
     state: "{{ item[0] }}"
   with_items:
-    - "{{ stig_packages | selectattr('enabled') | groupby('state') }}"
+    - "{{ stig_packages_rhel7 | selectattr('enabled') | groupby('state') }}"
   tags:
     - cat1
     - auth
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 554e160e..3dda4439 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -101,7 +101,7 @@ stig_packages:
 # RHEL 7 STIG: Packages to add/remove
 stig_packages_rhel7:
   - packages:
-      - openssh-client
+      - openssh-clients
       - openssh-server
       - screen
     state: "{{ security_package_state }}"
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 175bf678..b9f027c3 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -93,7 +93,8 @@ stig_packages:
 # RHEL 7 STIG: Packages to add/remove
 stig_packages_rhel7:
   - packages:
-      - openssh-clients
+      - libpwquality-common
+      - openssh-client
       - openssh-server
       - screen
     state: "{{ security_package_state }}"