diff --git a/.zuul.yaml b/.zuul.yaml
index 09fdfcc9a..2340545c4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,6 +29,7 @@
 - job:
     name: vitrage-dsvm-api-py27
     parent: legacy-dsvm-base
+    voting: false
     run: playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
     post-run: playbooks/legacy/vitrage-dsvm-api-py27/post.yaml
     timeout: 7800
@@ -47,6 +48,7 @@
 - job:
     name: vitrage-dsvm-api-py35
     parent: legacy-dsvm-base
+    voting: false
     run: playbooks/legacy/vitrage-dsvm-api-py35/run.yaml
     post-run: playbooks/legacy/vitrage-dsvm-api-py35/post.yaml
     timeout: 7800
@@ -65,6 +67,7 @@
 - job:
     name: vitrage-dsvm-datasources-py27
     parent: legacy-dsvm-base
+    voting: false
     run: playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
     post-run: playbooks/legacy/vitrage-dsvm-datasources-py27/post.yaml
     timeout: 7800
@@ -83,6 +86,7 @@
 - job:
     name: vitrage-dsvm-datasources-py35
     parent: legacy-dsvm-base
+    voting: false
     run: playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml
     post-run: playbooks/legacy/vitrage-dsvm-datasources-py35/post.yaml
     timeout: 7800
@@ -135,6 +139,7 @@
 - job:
     name: grenade-vitrage
     parent: legacy-dsvm-base
+    voting: false
     run: playbooks/legacy/vitrage-grenade/run.yaml
     post-run: playbooks/legacy/vitrage-grenade/post.yaml
     timeout: 7800
diff --git a/vitrage/api/controllers/v1/template.py b/vitrage/api/controllers/v1/template.py
index 4bcb926ac..dec1f43d2 100644
--- a/vitrage/api/controllers/v1/template.py
+++ b/vitrage/api/controllers/v1/template.py
@@ -66,7 +66,9 @@ class TemplateController(RootRestController):
 
     @pecan.expose('json')
     def delete(self, **kwargs):
-        uuid = kwargs['uuid']
+        # for forward computability
+        uuid = kwargs['uuid'] if 'uuid' in kwargs else kwargs['id']
+
         LOG.info("delete template. uuid: %s", uuid)
 
         enforce("template delete",