diff --git a/manifests/baas2.pp b/manifests/baas2.pp
index 80d37d982..5587b7201 100644
--- a/manifests/baas2.pp
+++ b/manifests/baas2.pp
@@ -37,8 +37,8 @@
   Array[String] $backup_dirs = [],
   Array[String] $exclude_list = [],
   Boolean       $install_tbmr=false,
-  String        $tbmr_version='9.5.2.3206-1',
-  String        $tbmr_url='https://s3.sto1.safedc.net/94f5b4f4aa674782b6bc4181943e67f1:tbmr/wab0snk8lrh6l8cjzgnaozm8siw7g7/tbmr_9.5.2.3206-1_amd64.deb',
+  String        $tbmr_version='9.6.3.3418-1',
+  String        $tbmr_url="https://s3.sto1.safedc.net/94f5b4f4aa674782b6bc4181943e67f1:tbmr/wab0snk8lrh6l8cjzgnaozm8siw7g7/tbmr_${tbmr_version}_amd64.deb",
 ) {
 
   # MUST be set properly in hiera to continue
diff --git a/templates/baas2/dsm.sys.erb b/templates/baas2/dsm.sys.erb
index c86bbd09d..f69a02e43 100644
--- a/templates/baas2/dsm.sys.erb
+++ b/templates/baas2/dsm.sys.erb
@@ -75,5 +75,5 @@ SERVERNAME SafeDC
 <% if @install_tbmr -%>
 
 * Collect TBMR information before doing the backup
-PRESCHEDULECMD '"/usr/bin/tbmrcfg"'
+PRESCHEDULECMD '"/usr/bin/tbmrcfg" 1> tbmr.log 2>&1 || (exit 0)'
 <% end -%>