diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..46cac4d
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+- name: start services
+  service:
+    name: "{{ item }}"
+    state: started
+  when: not letsencrypt_cert.stat.exists
+  with_items: "{{ certbot_create_standalone_stop_services }}"
diff --git a/tasks/create-cert-standalone.yml b/tasks/create-cert-standalone.yml
index 6f25b8a..908d660 100644
--- a/tasks/create-cert-standalone.yml
+++ b/tasks/create-cert-standalone.yml
@@ -1,5 +1,5 @@
 ---
-- name: Check if certificate already exists.
+- name: Check if certificate already exists. ({{ cert_item.domains }})
   stat:
     path: /etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/cert.pem
   register: letsencrypt_cert
@@ -11,13 +11,7 @@
   when: not letsencrypt_cert.stat.exists
   with_items: "{{ certbot_create_standalone_stop_services }}"
 
-- name: Generate new certificate if one doesn't exist.
+- name: Generate new certificate if one doesn't exist. ({{ cert_item.domains }})
   command: "{{ certbot_create_command }}"
   when: not letsencrypt_cert.stat.exists
-
-- name: Start services after cert has been generated.
-  service:
-    name: "{{ item }}"
-    state: started
-  when: not letsencrypt_cert.stat.exists
-  with_items: "{{ certbot_create_standalone_stop_services }}"
+  notify: start services