diff --git a/github-bin/doctl.yml b/github-bin/doctl.yml
index 588c774..f2e99d5 100644
--- a/github-bin/doctl.yml
+++ b/github-bin/doctl.yml
@@ -36,4 +36,10 @@
     mode: "0644"
     checksum: sha256:https://github.com/{{ gh_user }}/{{ gh_project }}/releases/download/{{ release_latest['tag'] }}/{{ release_checksum }}
   when: not release_local.stat.exists
-  notify: "doctl updated"
+  register: doctl_dl
+
+- name: "doctl updated"
+  ansible.builtin.unarchive:
+    src: "{{ gh_bin_dir }}/{{ release_filename }}"
+    dest: "{{ home_dir }}/bin"
+  when: doctl_dl.changed
diff --git a/github-bin/main.yml b/github-bin/main.yml
index 75bcbe5..78eaf02 100644
--- a/github-bin/main.yml
+++ b/github-bin/main.yml
@@ -37,19 +37,3 @@
         gh_user: artempyanykh
         gh_project: marksman
 
-  handlers:
-    - name: "doctl updated"
-      ansible.builtin.unarchive:
-        src: "{{ gh_bin_dir }}/{{ release_filename }}"
-        dest: "{{ home_dir }}/bin"
-
-    - name: "starship updated"
-      ansible.builtin.unarchive:
-        src: "{{ gh_bin_dir }}/{{ release_filename }}"
-        dest: "{{ home_dir }}/bin"
-
-    - name: "marksman updated"
-      ansible.builtin.copy:
-        src: "{{ gh_bin_dir }}/{{ release_filename }}-{{ release_latest_tag }}"
-        dest: "{{ home_dir }}/bin/marksman"
-        mode: "0755"
diff --git a/github-bin/marksman.yml b/github-bin/marksman.yml
index ea685af..cca30be 100644
--- a/github-bin/marksman.yml
+++ b/github-bin/marksman.yml
@@ -31,4 +31,11 @@
     mode: "0644"
     # checksum: sha256:https://github.com/{{ gh_user }}/{{ gh_project }}/releases/download/{{ release_latest['tag'] }}/{{ release_checksum }}
   when: not release_local.stat.exists
-  notify: "marksman updated"
+  register: marksman_dl
+
+- name: "marksman updated"
+  ansible.builtin.copy:
+    src: "{{ gh_bin_dir }}/{{ release_filename }}-{{ release_latest_tag }}"
+    dest: "{{ home_dir }}/bin/marksman"
+    mode: "0755"
+  when: marksman_dl.changed
diff --git a/github-bin/starship.yml b/github-bin/starship.yml
index 7d08c7f..d375555 100644
--- a/github-bin/starship.yml
+++ b/github-bin/starship.yml
@@ -33,4 +33,10 @@
     mode: "0644"
     checksum: sha256:https://github.com/{{ gh_user }}/{{ gh_project }}/releases/download/{{ release_latest['tag'] }}/{{ release_checksum }}
   when: not release_local.stat.exists
-  notify: "starship updated"
+  register: starship_dl
+
+- name: "starship updated"
+  ansible.builtin.unarchive:
+    src: "{{ gh_bin_dir }}/{{ release_filename }}"
+    dest: "{{ home_dir }}/bin"
+  when: starship_dl.changed