diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml
index dd760b103c..5c1b1d8c5b 100644
--- a/roles/openvpn/server/tasks/main.yml
+++ b/roles/openvpn/server/tasks/main.yml
@@ -27,16 +27,16 @@
   - { file: server.conf,
       dest: /etc/openvpn/server/openvpn.conf,
       mode: '0644' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/crl.pem",
+  - { file: "{{ private }}/files/vpn/pki/crl.pem",
       dest: /etc/openvpn/server/crl.pem,
       mode: '0644' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/server.crt",
+  - { file: "{{ private }}/files/vpn/pki/issued/bastion.fedoraproject.org.crt",
       dest: /etc/openvpn/server/server.crt,
       mode: '0644' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/server.key",
+  - { file: "{{ private }}/files/vpn/openvpn/private/bastion.fedoraproject.org.key",
       dest: /etc/openvpn/server/server.key,
       mode: '0600' }
-  - { file: "{{ private }}/files/vpn/openvpn/keys/dh2048.pem",
+  - { file: "{{ private }}/files/vpn/openvpn/dh2048.pem",
       dest: /etc/openvpn/server/dh2048.pem,
       mode: '0644' }
   tags: