diff --git a/Library/scap-results/rule_waivers/rhel8/ospp-fail b/Library/scap-results/rule_waivers/rhel8/ospp-fail
index b6d9792..abb1cd9 100644
--- a/Library/scap-results/rule_waivers/rhel8/ospp-fail
+++ b/Library/scap-results/rule_waivers/rhel8/ospp-fail
@@ -1,3 +1,3 @@
-no_tmux_in_shells - needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
-configure_usbguard_auditbackend - needs to be remediatd once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
-configure_bashrc_exec_tmux - needs to be remediatd once more (notapplicable in initial scan because of no tmux, during remediation phase tmux is installed, but this rule is not remediated)
+no_tmux_in_shells - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
+configure_bashrc_exec_tmux - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because bashrc was not configured with tmux)
+configure_usbguard_auditbackend - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
diff --git a/Library/scap-results/rule_waivers/rhel8/stig-fail b/Library/scap-results/rule_waivers/rhel8/stig-fail
index f8989d5..c0fb144 100644
--- a/Library/scap-results/rule_waivers/rhel8/stig-fail
+++ b/Library/scap-results/rule_waivers/rhel8/stig-fail
@@ -1,6 +1,9 @@
-no_tmux_in_shells - needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
+no_tmux_in_shells - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
+configure_bashrc_exec_tmux - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because bashrc was not configured with tmux)
 accounts_password_set_max_life_existing - bz2050232
 accounts_password_set_min_life_existing - bz2050232
-configure_usbguard_auditbackend - needs to be remediatd once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
-configure_bashrc_exec_tmux - needs to be remediatd once more (notapplicable in initial scan because of no tmux, during remediation phase tmux is installed, but this rule is not remediated)
-accounts_password_pam_retry - needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+configure_usbguard_auditbackend - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
+set_password_hashing_algorithm_systemauth - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+set_password_hashing_algorithm_passwordauth - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+accounts_password_pam_retry - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+postfix_prevent_unrestricted_relay - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no postfix, during remediation phase postfix is installed, but this rule is not remediated)
diff --git a/Library/scap-results/rule_waivers/rhel9/ospp-fail b/Library/scap-results/rule_waivers/rhel9/ospp-fail
index b6d9792..9d457e1 100644
--- a/Library/scap-results/rule_waivers/rhel9/ospp-fail
+++ b/Library/scap-results/rule_waivers/rhel9/ospp-fail
@@ -1,3 +1,3 @@
-no_tmux_in_shells - needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
-configure_usbguard_auditbackend - needs to be remediatd once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
-configure_bashrc_exec_tmux - needs to be remediatd once more (notapplicable in initial scan because of no tmux, during remediation phase tmux is installed, but this rule is not remediated)
+no_tmux_in_shells - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
+configure_usbguard_auditbackend - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
+configure_bashrc_exec_tmux - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no tmux, during remediation phase usbguard is installed, but this rule is not remediated)
diff --git a/Library/scap-results/rule_waivers/rhel9/stig-fail b/Library/scap-results/rule_waivers/rhel9/stig-fail
index f8989d5..e1dc77f 100644
--- a/Library/scap-results/rule_waivers/rhel9/stig-fail
+++ b/Library/scap-results/rule_waivers/rhel9/stig-fail
@@ -1,6 +1,9 @@
-no_tmux_in_shells - needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
+no_tmux_in_shells - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (passes in initial scan because of no tmux, during remediation phase tmux is installed, fails during the final scan because the tmux was added to shells)
 accounts_password_set_max_life_existing - bz2050232
 accounts_password_set_min_life_existing - bz2050232
-configure_usbguard_auditbackend - needs to be remediatd once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
-configure_bashrc_exec_tmux - needs to be remediatd once more (notapplicable in initial scan because of no tmux, during remediation phase tmux is installed, but this rule is not remediated)
-accounts_password_pam_retry - needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+configure_usbguard_auditbackend - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no usbguard, during remediation phase usbguard is installed, but this rule is not remediated)
+configure_bashrc_exec_tmux - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no tmux, during remediation phase usbguard is installed, but this rule is not remediated)
+set_password_hashing_algorithm_systemauth - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+set_password_hashing_algorithm_passwordauth - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+accounts_password_pam_retry - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (pass in initial scan, enable_authselect breaks it, but this rule is not remediated as it passed in initial scan)
+postfix_prevent_unrestricted_relay - https://github.com/OpenSCAP/openscap/issues/1880, needs to be remediated once more (notapplicable in initial scan because of no postfix, during remediation phase postfix is installed, but this rule is not remediated)