diff --git a/roles/common/tasks/apt-gateway.yml b/roles/common/tasks/apt-gateway.yml
index e7e33b3..a4d6704 100644
--- a/roles/common/tasks/apt-gateway.yml
+++ b/roles/common/tasks/apt-gateway.yml
@@ -1,30 +1,30 @@
 ---
 
 - name: (apt-gateway.yml) Install gateway related packages
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_gateway_host_pkgs }}"
     state: "{{ apt_install_state }}"
 
 
 - name: (apt-gateway.yml) Check if file '/etc/logrotate.d/speedtest' exists
-  stat:
+  ansible.builtin.stat:
     path: /etc/logrotate.d/speedtest
-  register: logrotate_speedtest_exists
+  register: common_logrotate_speedtest_exists
 
 
 - name: (apt-gateway.yml) Ensure file /etc/logrotate.d/speedtest exists
-  copy:
+  ansible.builtin.copy:
     src: "{{ role_path + '/files/etc/logrotate.d/speedtest' }}"
     dest: /etc/logrotate.d/speedtest
     owner: root
     group: root
-    mode: 0644
-  when:  
-    - logrotate_speedtest_exists.stat.exists == False
+    mode: '0644'
+  when:
+    - not common_logrotate_speedtest_exists.stat.exists
 
 
 - name: (apt-gateway.yml) Set crontab entry for nightly speedtests
-  cron:
+  ansible.builtin.cron:
     name: 'Speedtest'
     minute: 13
     hour: 0-8