diff --git a/docker-compose/self-test.service b/docker-compose/self-test.service
index 3062a8f..ba1cef6 100644
--- a/docker-compose/self-test.service
+++ b/docker-compose/self-test.service
@@ -6,10 +6,9 @@ After=docker.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/bin/true
-ExecStop=/bin/true
-ExecStartPost=/usr/local/bin/docker-compose -f /opt/tsg/self_test/compose/docker-compose.yml up -d
-ExecStopPost=/usr/local/bin/docker-compose -f /opt/tsg/self_test/compose/docker-compose.yml down
+WorkingDirectory=/opt/tsg/self_test/compose/%i
+ExecStart=/usr/local/bin/docker-compose up -d  --remove-orphans
+ExecStop=/usr/local/bin/docker-compose down --remove-orphans
 
 [Install]
 WantedBy=multi-user.target