diff --git a/plans/optf-osdf/osdf/setup.sh b/plans/optf-osdf/osdf/setup.sh
index d2d45af..42e9aec 100755
--- a/plans/optf-osdf/osdf/setup.sh
+++ b/plans/optf-osdf/osdf/setup.sh
@@ -20,7 +20,7 @@
 
 #
 echo "# aaf-sms setup.sh script";
-source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh
+source ${WORKSPACE}/scripts/optf-osdf/osdf/setup-sms.sh
 
 echo "# simulator scripts calling";
 source ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh
diff --git a/plans/optf-osdf/osdf/teardown.sh b/plans/optf-osdf/osdf/teardown.sh
index cae8dcc..3457295 100755
--- a/plans/optf-osdf/osdf/teardown.sh
+++ b/plans/optf-osdf/osdf/teardown.sh
@@ -31,5 +31,6 @@
 kill-instance.sh osdf_sim
 
 echo "# aaf-sms teardown.sh script";
-source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh
+kill-instance.sh sms
+kill-instance.sh vault