diff --git a/roles/httpd/certificate/tasks/main.yml b/roles/httpd/certificate/tasks/main.yml
index 5c7fa1cdb7..e37783a0ca 100644
--- a/roles/httpd/certificate/tasks/main.yml
+++ b/roles/httpd/certificate/tasks/main.yml
@@ -21,12 +21,12 @@
 - name: Copy {{name}}.cert
   copy: >
     src={{item}}
-    dest=/etc/pki/tls/certs/{{item}}
+    dest=/etc/pki/tls/certs/{{item | basename}}
     owner=root
     group=root
     mode=0644
   with_first_found:
-  - "{{cert}}"
+  - "{{private}}/files/httpd/{{cert}}.cert"
   - "{{private}}/files/httpd/{{name}}.cert"
   notify:
   - restart httpd
@@ -37,12 +37,12 @@
 - name: Copy {{name}}.key
   copy: >
     src={{item}}
-    dest=/etc/pki/tls/private/{{item}}
+    dest=/etc/pki/tls/private/{{item | basename}}
     owner=root
     group=root
     mode=0600
   with_first_found:
-  - "{{key}}"
+  - "{{private}}/files/httpd/{{key}}.key"
   - "{{private}}/files/httpd/{{name}}.key"
   notify:
   - restart httpd