diff --git a/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/10_templated_role_query.yml b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/10_templated_role_query.yml
index 8c3788d5103..30284ab1645 100644
--- a/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/10_templated_role_query.yml
+++ b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/10_templated_role_query.yml
@@ -93,12 +93,17 @@ setup:
             }
 
   - do:
-      put_template:
+      put_script:
         id: "1"
         body: >
             {
-              "term" : {
-                "username" : "{{_user.username}}"
+              "script": {
+                "lang": "mustache",
+                "source": {
+                  "term" : {
+                    "username" : "{{_user.username}}"
+                  }
+                }
               }
             }
 
diff --git a/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/11_templated_role_query_runas.yml b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/11_templated_role_query_runas.yml
index 68c9bba7432..0c6bd4cbdac 100644
--- a/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/11_templated_role_query_runas.yml
+++ b/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/11_templated_role_query_runas.yml
@@ -93,12 +93,17 @@ setup:
             }
 
   - do:
-      put_template:
+      put_script:
         id: "1"
         body: >
             {
-              "term" : {
-                "username" : "{{_user.username}}"
+              "script": {
+                "lang": "mustache",
+                "source": {
+                  "term" : {
+                    "username" : "{{_user.username}}"
+                  }
+                }
               }
             }
 
diff --git a/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yml b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yml
index b39e05e4bc7..28e2788fedb 100644
--- a/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yml
+++ b/qa/smoke-test-watcher-with-mustache/src/test/resources/rest-api-spec/test/watcher_mustache/30_search_input.yml
@@ -102,18 +102,23 @@ setup:
 "Test search input mustache integration (using request template)":
 
   - do:
-      put_template:
+      put_script:
         id: "search-template"
         body: {
-                "query" : {
-                  "bool" : {
-                    "must" : [
-                      {
-                        "term" : {
-                          "value" : "val_{{num}}"
-                        }
+                "script": {
+                  "lang": "mustache",
+                  "source": {
+                    "query" : {
+                      "bool" : {
+                        "must" : [
+                          {
+                            "term" : {
+                              "value" : "val_{{num}}"
+                            }
+                          }
+                        ]
                       }
-                    ]
+                    }
                   }
                 }
               }