diff --git a/tasks/ssl/standard.yml b/tasks/ssl/standard.yml
index 42dd695..0f57687 100644
--- a/tasks/ssl/standard.yml
+++ b/tasks/ssl/standard.yml
@@ -18,7 +18,7 @@
 
 - name: FILE | Create SSL directories
   file:
-    path: "{{ nginx_ssl_dir + '/' + item.name }}"
+    path: "{{ nginx_ssl_dir + '/' + item | nginx_site_name }}"
     state: directory
   with_items: "{{ nginx_ssl_pairs }}"
   when: item.dest_key is not defined or item.dest_cert is not defined
@@ -27,7 +27,7 @@
 - name: COPY | Deploy SSL keys
   copy:
     content: "{{ item.key }}"
-    dest: "{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.key' if item.dest_key is not defined else item.dest_key }}"
+    dest: "{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.key' if item.dest_key is not defined else item.dest_key }}"
     mode: 0640
   with_items: "{{ nginx_ssl_pairs }}"
   when: item.key is defined
@@ -37,7 +37,7 @@
 - name: COPY | Deploy SSL certs
   copy:
     content: "{{ item.cert }}"
-    dest: "{{ nginx_ssl_dir + '/' + item.name + '/' + item.name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
+    dest: "{{ nginx_ssl_dir + '/' + item | nginx_site_name + '/' + item | nginx_site_name + '.crt' if item.dest_cert is not defined else item.dest_cert }}"
     mode: 0644
   with_items: "{{ nginx_ssl_pairs }}"
   when: item.cert is defined