diff --git a/tasks/keystone_ssl_user_provided.yml b/tasks/keystone_ssl_user_provided.yml
index 1828dc81..e0f7a6fb 100644
--- a/tasks/keystone_ssl_user_provided.yml
+++ b/tasks/keystone_ssl_user_provided.yml
@@ -13,17 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Drop user provided ssl cert and key
+- name: Drop user provided ssl cert
   copy:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "{{ keystone_user_ssl_cert }}"
+    dest: "{{ keystone_ssl_cert }}"
     owner: "root"
     group: "root"
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: "{{ keystone_user_ssl_cert }}", dest: "{{ keystone_ssl_cert }}", mode: "0644" }
-    - { src: "{{ keystone_user_ssl_key }}", dest: "{{ keystone_ssl_key }}", mode: "0640" }
-  when: keystone_user_ssl_cert is defined and keystone_user_ssl_key is defined
+    mode: "0644"
+  when: keystone_user_ssl_cert is defined
+  notify: Restart Apache
+  tags:
+    - keystone-configs
+    - keystone-ssl
+
+- name: Drop user provided ssl key
+  copy:
+    src: "{{ keystone_user_ssl_key }}"
+    dest: "{{ keystone_ssl_key }}"
+    owner: "root"
+    group: "root"
+    mode: "0640"
+  when: keystone_user_ssl_key is defined
   notify: Restart Apache
   tags:
     - keystone-configs