diff --git a/tasks/configure_debian.yml b/tasks/configure_debian.yml
index 51f5e29..30dfac1 100644
--- a/tasks/configure_debian.yml
+++ b/tasks/configure_debian.yml
@@ -1,10 +1,8 @@
 ---
 - name: Fix default vim (debian)
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: /etc/vim/vimrc
     regexp: '^\"\s*let\sg\:skip_defaults_vim.*$'
-    line: 'let g:skip_defaults_vim = 1'
+    line: "let g:skip_defaults_vim = 1"
     state: present
-    backrefs: yes
-  become: True
-  become_user: root
+    backrefs: True
diff --git a/tasks/configure_redhat.yml b/tasks/configure_redhat.yml
index a9c1dbb..b2534b3 100644
--- a/tasks/configure_redhat.yml
+++ b/tasks/configure_redhat.yml
@@ -1,11 +1,9 @@
 ---
 - name: Source local vimrc (redhat)
-  blockinfile:
+  ansible.builtin.blockinfile:
     dest: /etc/vimrc
-    marker: "\" {mark} ANSIBLE MANAGED BLOCK"
+    marker: '" {mark} ANSIBLE MANAGED BLOCK'
     block: |
       if filereadable("/etc/vim/vimrc.local")
           source /etc/vim/vimrc.local
       endif
-  become: True
-  become_user: root
diff --git a/tasks/main.yml b/tasks/main.yml
index 9b91bfa..e582492 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,7 @@
 ---
-- include_vars: "{{ ansible_os_family | lower }}.yml"
-
-- import_tasks: setup.yml
-
-- include_tasks: "{{ lookup('first_found', params) }}"
+- ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml"
+- ansible.builtin.import_tasks: setup.yml
+- ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
     params:
       files:
diff --git a/tasks/setup.yml b/tasks/setup.yml
index fa365b4..18fb7dd 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,24 +1,21 @@
 ---
-- block:
-    - name: Installing vim
-      package:
-        name: "{{ vim_package_name }}"
-        state: present
+- name: Installing vim
+  ansible.builtin.package:
+    name: "{{ vim_package_name }}"
+    state: present
 
-    - name: Creating configuration directory
-      file:
-        state: directory
-        dest: /etc/vim
-        owner: root
-        group: root
-        mode: 0755
+- name: Creating configuration directory
+  ansible.builtin.file:
+    state: directory
+    dest: /etc/vim
+    owner: root
+    group: root
+    mode: "0755"
 
-    - name: Configure vim
-      template:
-        src: etc/vim/vimrc.local.j2
-        dest: /etc/vim/vimrc.local
-        owner: root
-        group: root
-        mode: 0644
-  become: True
-  become_user: root
+- name: Configure vim
+  ansible.builtin.template:
+    src: etc/vim/vimrc.local.j2
+    dest: /etc/vim/vimrc.local
+    owner: root
+    group: root
+    mode: "0644"