diff --git a/jjb/repos/tost-onos.yaml b/jjb/repos/tost-onos.yaml
index 623c835..fbd2777 100644
--- a/jjb/repos/tost-onos.yaml
+++ b/jjb/repos/tost-onos.yaml
@@ -31,6 +31,7 @@
           make-test-targets: 'docker-build'
           junit-allow-empty-results: true
           build-node: '{bigger-build-node}'
+      # Verify only for changes in files different from Makefile.vars.stable
       - 'private-make-test':
           target: 'master'
           name-extension: '-{target}'
@@ -38,6 +39,8 @@
           make-test-targets: 'docker-build'
           junit-allow-empty-results: true
           build-node: '{bigger-build-node}'
+          all-files-regexp: '^((?!Makefile.vars.stable|\/COMMIT_MSG).)*$'
+      # Verify only for changes in files different from Makefile.vars.master
       - 'private-make-test':
           target: 'stable'
           name-extension: '-{target}'
@@ -45,6 +48,7 @@
           make-test-targets: 'docker-build'
           junit-allow-empty-results: true
           build-node: '{bigger-build-node}'
+          all-files-regexp: '^((?!Makefile.vars.master|\/COMMIT_MSG).)*$'
 
 - job-group:
     name: 'publish-tost-onos-jobs'
@@ -62,7 +66,8 @@
           maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
           build-timeout: 30
           dependency-jobs: 'version-tag_tost-onos'
-      # Post-merge and nightly triggered
+      # Post-merge and nightly triggered - on merge build only for changes
+      # in files different from Makefile.vars.stable
       - 'tost-onos-docker-publish':
           target: 'master'
           name-extension: '-{target}'
@@ -72,6 +77,7 @@
           maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
           build-timeout: 30
           buildDate: ''
+          all-files-regexp: '^((?!Makefile.vars.stable|\/COMMIT_MSG).)*$'
       # Weekly triggered
       - 'weekly-tost-onos-docker-publish':
           target: 'master'
@@ -82,7 +88,8 @@
           maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
           build-timeout: 30
           timed: 'H 0 * * 5'
-      # Post-merge only
+      # Post-merge only - on merge build only for changes in files
+      # different from Makefile.vars.master
       - 'tost-onos-docker-publish':
           target: 'stable'
           name-extension: '-{target}'
@@ -92,6 +99,7 @@
           maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
           build-timeout: 30
           timed: ''
+          all-files-regexp: '^((?!Makefile.vars.master|\/COMMIT_MSG).)*$'
 
 - job-group:
     name: 'release-tost-onos-jobs'