diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index e30a76be75..d011ceb114 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -17,11 +17,11 @@
   - { file: client.conf,
       dest: /etc/openvpn/openvpn.conf,
       mode: '0644' }
-  - { file: "{{ puppet_private }}/vpn/openvpn/keys/client.crt",
-      dest: "/etc/openvpn/{{ inventory_hostname }}.crt",
+  - { file: "{{ puppet_private }}/vpn/openvpn/keys/{{ inventory_hostname }}.crt",
+      dest: "/etc/openvpn/client.crt",
       mode: '0644' }
-  - { file: "{{ puppet_private }}/vpn/openvpn/keys/client.key",
-      dest: "/etc/openvpn/{{ inventory_hostname }}.key",
+  - { file: "{{ puppet_private }}/vpn/openvpn/keys/{{ inventory_hostname }}.key",
+      dest: "/etc/openvpn/client.key",
       mode: '0600' }
   tags:
   - install