diff --git a/roles/bootstrap/handlers/clamav.yml b/roles/bootstrap/tasks/configure_core/clamav.yml
similarity index 100%
rename from roles/bootstrap/handlers/clamav.yml
rename to roles/bootstrap/tasks/configure_core/clamav.yml
diff --git a/roles/bootstrap/handlers/crowdsec.yml b/roles/bootstrap/tasks/configure_core/crowdsec.yml
similarity index 100%
rename from roles/bootstrap/handlers/crowdsec.yml
rename to roles/bootstrap/tasks/configure_core/crowdsec.yml
diff --git a/roles/bootstrap/handlers/fail2ban.yml b/roles/bootstrap/tasks/configure_core/fail2ban.yml
similarity index 100%
rename from roles/bootstrap/handlers/fail2ban.yml
rename to roles/bootstrap/tasks/configure_core/fail2ban.yml
diff --git a/roles/bootstrap/handlers/git.yml b/roles/bootstrap/tasks/configure_core/git.yml
similarity index 100%
rename from roles/bootstrap/handlers/git.yml
rename to roles/bootstrap/tasks/configure_core/git.yml
diff --git a/roles/bootstrap/handlers/gpg.yml b/roles/bootstrap/tasks/configure_core/gpg.yml
similarity index 100%
rename from roles/bootstrap/handlers/gpg.yml
rename to roles/bootstrap/tasks/configure_core/gpg.yml