diff --git a/tsg-9140-scripts/roles/certstore/tasks/main.yml b/tsg-9140-scripts/roles/certstore/tasks/main.yml
index 07d94f65..3afb11ef 100644
--- a/tsg-9140-scripts/roles/certstore/tasks/main.yml
+++ b/tsg-9140-scripts/roles/certstore/tasks/main.yml
@@ -19,10 +19,18 @@
     src: "{{ role_path }}/templates/zlog.conf.j2"
     dest: /opt/tsg/certstore/conf/zlog.conf
 
+- name: "Create /usr/lib/systemd/system/certstore.service.d directory if it does not exist"
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: '0755'
+  with_items:
+    - /usr/lib/systemd/system/certstore.service.d
+
 - name: "copy memory limit file to certstore.service.d"
   copy:
-    src: "{{ role_path }}/files/memory.conf"
-    dest: /usr/lib/systemd/system/certstore.service.d/
+    src: "{{ role_path }}/templates/service_override_memsw_limit.conf.j2"
+    dest: /usr/lib/systemd/system/certstore.service.d/service_override_memsw_limit.confd
     mode: 0644
 
 - name: "copy cert-redis file to dest"
diff --git a/tsg-9140-scripts/roles/certstore/files/memory.conf b/tsg-9140-scripts/roles/certstore/templates/service_override_memsw_limit.conf.j2
similarity index 100%
rename from tsg-9140-scripts/roles/certstore/files/memory.conf
rename to tsg-9140-scripts/roles/certstore/templates/service_override_memsw_limit.conf.j2