diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_periodic_checking_systemd_timer/ansible/shared.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_periodic_checking_systemd_timer/ansible/shared.yml
index ba728ad7d042..36a76ba9f388 100644
--- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_periodic_checking_systemd_timer/ansible/shared.yml
+++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_periodic_checking_systemd_timer/ansible/shared.yml
@@ -42,6 +42,7 @@
     enabled: true
     daemon_reload: true
     masked: false
+  when: not ansible_check_mode
 
 - name: "{{{ rule_title }}} - Ensure AIDE Service Timer is Enabled"
   ansible.builtin.systemd:
@@ -50,3 +51,4 @@
     enabled: true
     daemon_reload: true
     masked: false
+  when: not ansible_check_mode
diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
index 7a92cfd8cdb7..1ca730dc2f79 100644
--- a/shared/macros/10-bash.jinja
+++ b/shared/macros/10-bash.jinja
@@ -500,7 +500,9 @@ fi
 {{%- elif pkg_manager == "apt_get" -%}}
 DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=60 remove -y "{{{ package }}}"
 {{%- elif pkg_manager == "zypper" -%}}
-zypper remove -y "{{{ package }}}"
+if rpm -q --quiet \"{{{ package }}}\" ; then
+   zypper remove -y "{{{ package }}}"
+fi
 {{%- else -%}}
 {{{ die("Can't generate a remediation for " + pkg_manager) }}}
 {{%- endif -%}}