diff --git a/roles/tsg-env-mcn1/files/tsg-env.service b/roles/tsg-env-mcn1/files/tsg-env.service
index b8c7fe2..edfbe36 100644
--- a/roles/tsg-env-mcn1/files/tsg-env.service
+++ b/roles/tsg-env-mcn1/files/tsg-env.service
@@ -6,6 +6,7 @@ Before=tfe-env.service
 
 [Service]
 ExecStart=/opt/tsg/env/setup
+ExecStop=/opt/tsg/env/stop
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/roles/tsg-env-mcn2/files/tsg-env.service b/roles/tsg-env-mcn2/files/tsg-env.service
index 135abfb..0ad2061 100644
--- a/roles/tsg-env-mcn2/files/tsg-env.service
+++ b/roles/tsg-env-mcn2/files/tsg-env.service
@@ -6,6 +6,7 @@ Before=tfe-env.service
 
 [Service]
 ExecStart=/opt/tsg/env/setup
+ExecStop=/opt/tsg/env/stop
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/roles/tsg-env-mcn3/files/tsg-env.service b/roles/tsg-env-mcn3/files/tsg-env.service
index 135abfb..0ad2061 100644
--- a/roles/tsg-env-mcn3/files/tsg-env.service
+++ b/roles/tsg-env-mcn3/files/tsg-env.service
@@ -6,6 +6,7 @@ Before=tfe-env.service
 
 [Service]
 ExecStart=/opt/tsg/env/setup
+ExecStop=/opt/tsg/env/stop
 Type=oneshot
 RemainAfterExit=yes