diff --git a/ansible/roles/certstore/tasks/main.yml b/ansible/roles/certstore/tasks/main.yml
index fadf57da..c465f0c5 100644
--- a/ansible/roles/certstore/tasks/main.yml
+++ b/ansible/roles/certstore/tasks/main.yml
@@ -33,6 +33,12 @@
     dest: /usr/lib/systemd/system/certstore.service.d/service_override_slice.conf
     mode: 0644
 
+- name: "copy env file to certstore.service.d"
+  copy:
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/certstore.service.d/service_override_env.conf
+    mode: 0644
+
 - name: "Create /usr/lib/systemd/system/cert-redis.service.d directory if it does not exist"
   file:
     path: "{{ item }}"
diff --git a/ansible/roles/certstore/templates/service_override_env.conf.j2 b/ansible/roles/certstore/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..4d73ff5f
--- /dev/null
+++ b/ansible/roles/certstore/templates/service_override_env.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file
diff --git a/ansible/roles/sapp/tasks/main.yml b/ansible/roles/sapp/tasks/main.yml
index 4c78c701..42c36ee7 100644
--- a/ansible/roles/sapp/tasks/main.yml
+++ b/ansible/roles/sapp/tasks/main.yml
@@ -155,8 +155,8 @@
 
 - name: "copy env conf to sapp.service.d"
   copy:
-    src: "{{ role_path }}/templates/service_env.conf.j2"
-    dest: /usr/lib/systemd/system/sapp.service.d/service_env.conf
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/sapp.service.d/service_override_env.conf
     mode: 0644
 
 - name: "copy fake promisc tools for tera mode - service file and scripts"
diff --git a/ansible/roles/sapp/templates/service_env.conf.j2 b/ansible/roles/sapp/templates/service_env.conf.j2
deleted file mode 100644
index 9d4a4f52..00000000
--- a/ansible/roles/sapp/templates/service_env.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="ZLOG_PROFILE_ERROR=/var/log/zlog.error.log"
\ No newline at end of file
diff --git a/ansible/roles/sapp/templates/service_override_env.conf.j2 b/ansible/roles/sapp/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..b5b92008
--- /dev/null
+++ b/ansible/roles/sapp/templates/service_override_env.conf.j2
@@ -0,0 +1,3 @@
+[Service]
+Environment="ZLOG_PROFILE_ERROR=/var/log/zlog.error.log"
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file
diff --git a/ansible/roles/tfe/tasks/main.yml b/ansible/roles/tfe/tasks/main.yml
index 400e6321..f7e6e44e 100644
--- a/ansible/roles/tfe/tasks/main.yml
+++ b/ansible/roles/tfe/tasks/main.yml
@@ -74,6 +74,12 @@
     dest: /usr/lib/systemd/system/tfe.service.d/service_override_slice.conf
     mode: 0644
 
+- name: "copy env file to tfe.service.d"
+  copy:
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/tfe.service.d/service_override_env.conf
+    mode: 0644
+
 - name: "replace action: replace service WantedBy from multi-user.target to workload.target"
   replace:
     path: "{{ item }}"
diff --git a/ansible/roles/tfe/templates/service_override_env.conf.j2 b/ansible/roles/tfe/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..4d73ff5f
--- /dev/null
+++ b/ansible/roles/tfe/templates/service_override_env.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file