diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ce32e..c10b6d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## Unreleased
 
+### Changed
+
+- chore: use FQCN for module name
+
 ## 1.0.1 - 2019-08-17
 
 ### Fixed
diff --git a/handlers/main.yml b/handlers/main.yml
index 1d9c902..a976675 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 - name: restart grafana
-  systemd:
+  ansible.builtin.service:
     name: grafana-server
     state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 8ff4bdc..917761a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,15 @@
 ---
 - name: install dependencies packages
-  apt:
-    name: apt-transport-https
+  ansible.builtin.package:
+    name:
+      - apt-transport-https
   retries: 2
   register: result
   until: result is succeeded
   tags: grafana
 
 - name: add repository key
-  apt_key:
+  ansible.builtin.apt_key:
     url: https://packages.grafana.com/gpg.key
   retries: 2
   register: result
@@ -16,20 +17,21 @@
   tags: grafana
 
 - name: add repository
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: deb https://packages.grafana.com/oss/deb stable main
   tags: grafana
 
 - name: install grafana package
-  apt:
-    name: grafana
+  ansible.builtin.package:
+    name:
+      - grafana
   retries: 2
   register: result
   until: result is succeeded
   tags: grafana
 
 - name: copy configuration file
-  template:
+  ansible.builtin.template:
     src: grafana.ini.j2
     dest: /etc/grafana/grafana.ini
     owner: root
@@ -39,7 +41,7 @@
   tags: grafana
 
 - name: copy ldap configuration file
-  template:
+  ansible.builtin.template:
     src: ldap.toml.j2
     dest: /etc/grafana/ldap.toml
     owner: root
@@ -58,8 +60,8 @@
   tags: grafana
 
 - name: enable and start service
-  systemd:
+  ansible.builtin.service:
     name: grafana-server
     state: started
-    enabled: yes
+    enabled: true
   tags: grafana