diff --git a/CHANGELOG.md b/CHANGELOG.md
index 609b2a9..788b5d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Fix
 * Replace flatten jinja filter with **list**.
+* Call module with FQCN.
 
 ## v1.1.2
 
diff --git a/tasks/main.yml b/tasks/main.yml
index e8165b6..3b4d92a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,7 +5,7 @@
 
 # Server Manage required system packages [[[1
 - name: Ensure required packages are in there desired state
-  package:
+  ansible.builtin.package:
     name: '{{ xymon_server__base_packages | list }}'
     state: '{{ "present" if (xymon_server__deploy_state == "present") else "absent" }}'
     install_recommends: False
@@ -15,7 +15,7 @@
 # Server Manage /etc configuration files [[[1
 
 - name: Ensure /etc directory structure exists
-  file:
+  ansible.builtin.file:
     path: '/etc/xymon/{{ item.path }}'
     state: directory
   with_filetree: '{{ xymon_server__etc_src }}'
@@ -23,7 +23,7 @@
   notify: ['restart xymon server service']
 
 - name: Generate Xymon configuration files
-  template:
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: "/etc/xymon/{{ item.path | replace('.j2','') }}"
     mode: '{{ item.mode }}'
@@ -32,7 +32,7 @@
   notify: ['restart xymon server service']
 
 - name: Generate Xymon configuration symlinks
-  template:
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: "/etc/xymon/{{ item.path }}"
     mode: '{{ item.mode }}'
@@ -45,7 +45,7 @@
 # Manage service [[[1
 
 - name: Manage Xymon server service
-  service:
+  ansible.builtin.service:
     name: '{{ xymon_server__service_name }}'
     state: '{{ "started" if (xymon_server__deploy_state == "present" and
                             (xymon_server__service_manage | d(True) | bool))