diff --git a/global_handlers/global_handlers.yml b/global_handlers/global_handlers.yml
index eaac8c0..c038baa 100644
--- a/global_handlers/global_handlers.yml
+++ b/global_handlers/global_handlers.yml
@@ -1,20 +1,34 @@
 ---
-- name: Update_aide_database
-  tags: aide,hardening,system
-  block:
-    - name: system setup | aide | run aide --update to check for legitimate changes
-      command: aide --config /etc/aide/aide.conf --update
-      register: aide_update_result
-      changed_when: "'new database written to' in aide_update_result.stdout"
-      async: 1800 # Allow up to 30 minutes for update
-      poll: 15
+- name: apt_update
+  apt:
+    update_cache: yes
+  when: ansible_os_family == "Debian"
 
-    - name: system setup | aide | activate updated database
-      copy:
-        src: /var/lib/aide/aide.db.new
-        dest: /var/lib/aide/aide.db
-        remote_src: true
-        owner: root
-        group: root
-        mode: '0600'
-      when: aide_update_result.changed
\ No newline at end of file
+- name: restart_sshd
+  service:
+    name: "{{ openssh_service }}"
+    state: restarted
+
+- name: restart_fail2ban
+  service:
+    name: "fail2ban"
+    state: restarted
+
+- name: restart_logind
+  service:
+    name: "logind"
+    state: restarted
+
+- name: reload ufw
+  command: ufw reload
+  listen: "reload ufw firewall"
+
+- name: restart auditd
+  service:
+    name: auditd
+    state: restarted
+
+- name: restart rsyslog
+  ansible.builtin.service:
+    name: rsyslog
+    state: restarted
\ No newline at end of file
diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml
index cf86ff4..92e659c 100644
--- a/roles/base/handlers/main.yml
+++ b/roles/base/handlers/main.yml
@@ -1,22 +1,4 @@
 ---
-- name: apt_update
-  apt: update_cache=yes
-
-- name: restart_sshd
-  service:
-    name: "{{ openssh_service }}"
-    state: restarted
-
-- name: restart_fail2ban
-  service:
-    name: "fail2ban"
-    state: restarted
-
-- name: restart_logind
-  service:
-    name: "logind"
-    state: restarted
-
 - name: update_tmux_plugin_perms
   file:
     path: /home/rene/.tmux/plugins
diff --git a/roles/bastionhost/handlers/main.yml b/roles/bastionhost/handlers/main.yml
index 9342b12..3e399c2 100644
--- a/roles/bastionhost/handlers/main.yml
+++ b/roles/bastionhost/handlers/main.yml
@@ -1,18 +1,4 @@
 ---
-- name: reload ufw
-  command: ufw reload
-  listen: "reload ufw firewall"
-
-- name: restart auditd
-  service:
-    name: auditd
-    state: restarted
-
-- name: restart rsyslog
-  ansible.builtin.service:
-    name: rsyslog
-    state: restarted
-
 - name: Update_aide_database
   block: # This block is now a task within the handler
     - name: system setup | aide | run aide --update to check for legitimate changes
diff --git a/roles/jitsimeet/handlers/main.yml b/roles/jitsimeet/handlers/main.yml
index 0ea545b..2c86dfd 100644
--- a/roles/jitsimeet/handlers/main.yml
+++ b/roles/jitsimeet/handlers/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: apt_update
-  apt: update_cache=yes
-
 - name: restart_jitsi
   service:
     name: "prosody jicofo jitsi-videobridge2"