diff --git a/.yamllint b/.yamllint
index b4f3fc1..ac440f1 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 ignore: |
   .travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2027425..1d5201e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Items starting with `DEPRECATE` are important deprecation notices.
 
+## 1.0.2 (2020-03-18)
+
+* Add Debian buster compatibility
+* Fix duplicate handlers execution
+
 ## 1.0.1 (2019-07-24)
 
 * Systemd service start after network-online instead of network
diff --git a/defaults/main.yml b/defaults/main.yml
index 823ecc9..96b58bd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,9 +8,10 @@
 prometheus_exporter__name: node_exporter
 
 # Name of the default variables
-prometheus_exporter__variables_prefix: "{{ prometheus_exporter__name|regex_replace('[\\w]exporter$', '') }}_exporter"
+prometheus_exporter__variables_prefix: "{{ prometheus_exporter__name|regex_replace('[^a-zA-Z0-9]exporter$', '') }}_exporter"
+
 # Name of the tasks tags
-prometheus_exporter__tag_name: "{{ prometheus_exporter__name|regex_replace('[\\w]exporter$', '') }}-exporter"
+prometheus_exporter__tag_name: "{{ prometheus_exporter__name|regex_replace('[^a-zA-Z0-9]exporter$', '') }}-exporter"
 
 # Select the exporter version to install
 prometheus_exporter__version: "{{ vars[prometheus_exporter__variables_prefix~'__version'] }}"
diff --git a/handlers/main.yml b/handlers/main.yml
index 00a35ca..951b143 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,4 +6,3 @@
     name: '{{ prometheus_exporter__service_name }}'
     state: restarted
   when: prometheus_exporter__service_enabled|bool
-  listen: ['restart-{{ prometheus_exporter__tag_name }}']
diff --git a/meta/main.yml b/meta/main.yml
index 4952b10..7186b99 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,6 +10,7 @@ galaxy_info:
       versions:
         - jessie
         - stretch
+        - buster
     - name: EL
       versions:
         - 7
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 0a15ade..4b0c799 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,8 +3,7 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: yamllint .
 platforms:
   - name: debian8
     image: turgon37/docker-debian8-ansible
@@ -18,6 +17,12 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: debian10
+    image: turgon37/docker-debian10-ansible
+    command: /lib/systemd/systemd
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos7
     image: turgon37/docker-centos7-ansible
     command: /usr/lib/systemd/systemd
diff --git a/tasks/main.yml b/tasks/main.yml
index 8643596..02947ea 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,15 +23,15 @@
 
 - name: Importing install tasks
   import_tasks: install.yml
-  tags: ['prometheus-exporter', 'prometheus-exporter-install', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-install']
+  tags: ['prometheus-exporter', 'prometheus-exporter-install']
 
 - name: Importing configuration tasks
   import_tasks: configure.yml
-  tags: ['prometheus-exporter', 'prometheus-exporter-configure', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-configure']
+  tags: ['prometheus-exporter', 'prometheus-exporter-configure']
 
 - name: Importing service tasks
   import_tasks: service.yml
-  tags: ['prometheus-exporter', 'prometheus-exporter-service', '{{ prometheus_exporter__tag_name }}', '{{ prometheus_exporter__tag_name }}-service']
+  tags: ['prometheus-exporter', 'prometheus-exporter-service']
 
 - name: Ensure handlers are trigger correctly
   meta: flush_handlers