diff --git a/script/service/tfe-env-tun-mode.service b/script/service/tfe-env-tun-mode.service
index 1fbfe48..6319f9d 100644
--- a/script/service/tfe-env-tun-mode.service
+++ b/script/service/tfe-env-tun-mode.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Tango Frontend Engine - Running Environment Setup
 Requires=tfe-env.service
-Before=tfe-env.service
+Before=tfe-env.service sapp.service
 After=network-online.target
 Wants=network-online.target
 
@@ -15,9 +15,7 @@ ExecStart=/bin/true
 ExecStop=/bin/true
 
 # start
-ExecStartPost=/usr/sbin/ifconfig ${TFE_WATCHDOG_DEVICE} ${TFE_WATCHDOG_IP}
-ExecStartPost=/usr/sbin/ip tuntap add dev ${TFE_DEVICE_DATA_INCOMING} mode tap
-ExecStartPost=/usr/sbin/ifconfig ${TFE_DEVICE_DATA_INCOMING} up
+ExecStartPost=/usr/sbin/ip tuntap add dev ${TFE_DEVICE_DATA_INCOMING} mode tap one_queue
 
 # stop
 ExecStopPost=/usr/bin/systemctl stop tfe-env
@@ -25,3 +23,4 @@ ExecStopPost=/usr/sbin/ip tuntap del dev ${TFE_DEVICE_DATA_INCOMING} mode tap
 
 [Install]
 WantedBy=multi-user.target
+RequiredBy=sapp.service