diff --git a/roles/zabbix_agent/tasks/main.yml b/roles/zabbix_agent/tasks/main.yml
index ee65c0d..2fca6ef 100644
--- a/roles/zabbix_agent/tasks/main.yml
+++ b/roles/zabbix_agent/tasks/main.yml
@@ -61,35 +61,37 @@
   when: zabbix_state == 'present'
 
 # Uninstall tasks
-- name: Stop and disable Zabbix agent2
+- name: Stop and disable all Zabbix agent services
   ansible.builtin.systemd:
-    name: zabbix-agent2
+    name: "{{ item }}"
     state: stopped
     enabled: false
+  loop:
+    - zabbix-agent
+    - zabbix-agent2
   when: zabbix_state == 'absent'
   ignore_errors: true
 
-- name: Remove Zabbix agent2 package
+- name: Remove all Zabbix agent packages
   ansible.builtin.apt:
-    name: zabbix-agent2
+    name:
+      - zabbix-agent
+      - zabbix-agent2
+      - zabbix-release
     state: absent
     purge: true
   when: zabbix_state == 'absent'
 
-- name: Remove Zabbix repository package
-  ansible.builtin.apt:
-    name: zabbix-release
-    state: absent
-    purge: true
-  when: zabbix_state == 'absent'
-
-- name: Reload systemd to drop the removed unit file
+- name: Reload systemd to drop removed unit files
   ansible.builtin.systemd:
     daemon_reload: true
   when: zabbix_state == 'absent'
 
-- name: Clear any lingering systemd state for zabbix-agent2
-  ansible.builtin.command: systemctl reset-failed zabbix-agent2
+- name: Clear any lingering systemd state for Zabbix agent services
+  ansible.builtin.command: systemctl reset-failed {{ item }}
+  loop:
+    - zabbix-agent
+    - zabbix-agent2
   when: zabbix_state == 'absent'
   ignore_errors: true
   changed_when: false