diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index eca694198..9fcbcb0b0 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -204,9 +204,6 @@ function configure_vitrage {
     # copy datasources
     cp $VITRAGE_DIR/etc/vitrage/datasources_values/*.yaml $VITRAGE_CONF_DIR/datasources_values
 
-    # copy templates
-    cp -rf $VITRAGE_DIR/vitrage_tempest_tests/tests/resources/templates/api/* $VITRAGE_CONF_DIR/templates/
-
     configure_auth_token_middleware $VITRAGE_CONF vitrage $VITRAGE_AUTH_CACHE_DIR
 
     iniset $VITRAGE_CONF "keystone_authtoken" password $ADMIN_PASSWORD
diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index a9786715b..5a7509e81 100644
--- a/devstack/post_test_hook.sh
+++ b/devstack/post_test_hook.sh
@@ -28,8 +28,12 @@ sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/he
 sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml /etc/vitrage/
 sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/server.yaml /etc/vitrage/
 sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/heat/policy.json-tempest /etc/heat/
+sudo cp -rf $DEVSTACK_PATH/vitrage/vitrage_tempest_tests/tests/resources/templates/api/* /etc/vitrage/templates/
 sudo cp $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
 
+# copied the templates need to restart
+sudo systemctl restart devstack@vitrage-graph.service
+
 if [ "$DEVSTACK_GATE_USE_PYTHON3" == "True" ]; then
         export PYTHON=python3
 fi