diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index ff1c571394..27c150d16a 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -50,10 +50,10 @@
   - { file: client.conf,
       dest: /etc/openvpn/openvpn.conf,
       mode: '0644' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.crt",
+  - { file: "{{ private }}/files/vpn/pki/issued/{{ inventory_hostname }}.crt",
       dest: "/etc/openvpn/client.crt",
       mode: '0600' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/{{ inventory_hostname }}.key",
+  - { file: "{{ private }}/files/vpn/pki/private/{{ inventory_hostname }}.key",
       dest: "/etc/openvpn/client.key",
       mode: '0600' }
   tags: