diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index b83a619..56e87ab 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -1,18 +1,17 @@
 ---
-- name: test docker setup
-  block:
-    - name: run hello-world container
-      become: true
-      register: docker_test
-      community.docker.docker_container:
-        state: started
-        name: hello-world
-        image: hello-world
+- name: run hello-world container
+  become: true
+  listen: docker_run_test
+  notify: docker_rm_test
+  community.docker.docker_container:
+    state: started
+    name: hello-world
+    image: hello-world
 
-    - name: remove hello-world container
-      become: true
-      when: docker_test is changed
-      community.docker.docker_container:
-        state: absent
-        name: hello-world
-        image: hello-world
+- name: remove hello-world container
+  become: true
+  listen: docker_rm_test
+  community.docker.docker_container:
+    state: absent
+    name: hello-world
+    image: hello-world