diff --git a/roles/mrzcpd/files/memory.conf b/roles/mrzcpd/files/memory.conf
deleted file mode 100644
index 5de1253..0000000
--- a/roles/mrzcpd/files/memory.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-MemoryMax=100G
\ No newline at end of file
diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml
index 1c97fea..327b8fd 100644
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -173,12 +173,6 @@
     daemon_reload: yes
   when: nic_traffic_mirror is defined
 
-- name: "copy memory limit file to tfe.service.d"
-  copy:
-    src: "{{ role_path }}/files/memory.conf"
-    dest: /etc/systemd/system/mrzcpd.service.d/
-    mode: 0644
-
 - name: "mask mrzcpd on server_tun_mode"
   systemd:
     name: mrzcpd
diff --git a/roles/sapp/templates/sapp.service.j2 b/roles/sapp/templates/sapp.service.j2
index e910e97..50a02a3 100644
--- a/roles/sapp/templates/sapp.service.j2
+++ b/roles/sapp/templates/sapp.service.j2
@@ -8,7 +8,7 @@ After=mrzcpd.service
 Type=notify
 WorkingDirectory=/home/mesasoft/sapp_run
 ExecStart=/home/mesasoft/sapp_run/sapp
-TimeoutSec=300s
+TimeoutSec=900s
 RestartSec=10s
 Restart=always
 LimitNOFILE=524288
diff --git a/roles/tfe/files/tfe.service b/roles/tfe/files/tfe.service
index d146371..a601e58 100644
--- a/roles/tfe/files/tfe.service
+++ b/roles/tfe/files/tfe.service
@@ -8,7 +8,7 @@ After=tfe-env.service
 Type=notify
 ExecStart=/opt/tsg/tfe/bin/tfe
 WorkingDirectory=/opt/tsg/tfe/
-TimeoutSec=7200s
+TimeoutSec=900s
 RestartSec=10s
 Restart=always
 LimitNOFILE=524288