diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml
index d9e70da4a6..907be968f9 100644
--- a/roles/openvpn/server/tasks/main.yml
+++ b/roles/openvpn/server/tasks/main.yml
@@ -28,16 +28,16 @@
       dest: /etc/openvpn/server/openvpn.conf,
       mode: '0644' }
   - { file: "{{ private }}/files/vpn/openvpn/keys/crl.pem",
-      dest: /etc/openvpn/crl.pem,
+      dest: /etc/openvpn/server/crl.pem,
       mode: '0644' }
   - { file: "{{ private }}/files/vpn/openvpn/keys/server.crt",
-      dest: /etc/openvpn/server.crt,
+      dest: /etc/openvpn/server/server.crt,
       mode: '0644' }
   - { file: "{{ private }}/files/vpn/openvpn/keys/server.key",
-      dest: /etc/openvpn/server.key,
+      dest: /etc/openvpn/server/server.key,
       mode: '0600' }
   - { file: "{{ private }}/files/vpn/openvpn/keys/dh2048.pem",
-      dest: /etc/openvpn/dh2048.pem,
+      dest: /etc/openvpn/server/dh2048.pem,
       mode: '0644' }
   tags:
   - install