diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index 50bcd74..7f1edca 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -1,60 +1,59 @@
 ---
-
-- name: install packages
-  package:
+- name: Install packages
+  ansible.builtin.package:
     name: openvpn--
     state: installed
 
-- name: create chroot
-  file:
+- name: Create chroot
+  ansible.builtin.file:
     path: /var/openvpn
     state: directory
     mode: 0750
     owner: root
     group: _openvpn
 
-- name: create chroot /tmp
-  file:
+- name: Create chroot /tmp
+  ansible.builtin.file:
     path: /var/openvpn/tmp
     state: directory
     mode: 0770
     owner: _openvpn
     group: _openvpn
 
-- name: create config directory
-  file:
+- name: Create config directory
+  ansible.builtin.file:
     path: /etc/openvpn
     state: directory
     mode: 0755
     owner: root
     group: "{{ ansible_wheel }}"
 
-- name: create key directory
-  file:
+- name: Create key directory
+  ansible.builtin.file:
     path: /etc/openvpn/keys
     state: directory
     mode: 0700
     owner: root
     group: "{{ ansible_wheel }}"
 
-- name: copy authentication key
-  copy:
-    src: "{{ ansible_private }}/files/openvpn/tap0.key.{{ inventory_hostname }}"
+- name: Copy authentication key
+  ansible.builtin.copy:
+    src: "{{ ansible_private }}/files/openvpn/{{ inventory_hostname }}.key"
     dest: /etc/openvpn/keys/tap0.key
     mode: 0600
     owner: root
     group: "{{ ansible_wheel }}"
 
-- name: copy config
-  copy:
-    src: "{{ ansible_private }}/files/openvpn/tap0.conf.{{ inventory_hostname }}"
+- name: Copy config
+  ansible.builtin.copy:
+    src: "{{ ansible_private }}/files/openvpn/{{ inventory_hostname }}.conf"
     dest: /etc/openvpn/tap0.conf
     mode: 0600
     owner: root
     group: "{{ ansible_wheel }}"
 
-- name: create interface config
-  copy:
+- name: Create interface config
+  ansible.builtin.copy:
     src: hostname.tap0
     dest: /etc/hostname.tap0
     mode: 0600