diff --git a/jjb/fossa.yaml b/jjb/fossa.yaml
index d321b15..66fc131 100644
--- a/jjb/fossa.yaml
+++ b/jjb/fossa.yaml
@@ -8,6 +8,10 @@
     jobs:
       - 'fossa-verify':
           fossa-team: cord
+          project-regexp: '{all-projects-regexp}'
+          branch-regexp: '{all-branches-regexp}'
+          file-include-regexp: '{all-files-regexp}'
+
 
 - job-template:
     id: 'fossa-verify'
@@ -18,11 +22,6 @@
                   Created by {id} job-template from ci-management/jjb/fossa.yaml<br/>
                   Copyright (c) 2018-present Open Networking Foundation (ONF)
 
-    # template defaults
-    project-regexp: '{all-projects-regexp}'
-    branch-regexp: '{all-branches-regexp}'
-    file-include-regexp: '{all-files-regexp}'
-
     # replace with cord-infra-gerrit-trigger-patchset when skip-vote is removed
     triggers:
       - gerrit:
diff --git a/jjb/pipeline/fossa-verify.groovy b/jjb/pipeline/fossa-verify.groovy
index 855711c..ebf7769 100644
--- a/jjb/pipeline/fossa-verify.groovy
+++ b/jjb/pipeline/fossa-verify.groovy
@@ -27,7 +27,7 @@
   }
 
   options {
-      timeout("${params.build-timeout}")
+      timeout(15)
   }
 
   stages {
@@ -51,7 +51,7 @@
           ],
         ])
 
-        // Used later to set the branch/tag in
+        // Used later to set the branch/tag
         script {
           git_tag_or_branch = sh(script:"cd $projectName; if [[ \$(git tag -l --points-at HEAD) ]]; then git tag -l --points-at HEAD; else echo ${branchName}; fi", returnStdout: true).trim()
         }