diff --git a/sbin/bootstrap-cms b/sbin/bootstrap-cms
index 6d0051b7ef7fba806d1d9283cba354c5defbd3d7..504360c893861816c0fa9097ce393c5855640e3a 100755
--- a/sbin/bootstrap-cms
+++ b/sbin/bootstrap-cms
@@ -79,7 +79,7 @@ bs_test_basic_network_connection cern.ch 80
 bs_test_basic_network_connection vccs.cern.ch 443 VCCS
 bs_test_basic_network_connection vocms0840.cern.ch 9618 HTCondor
 bs_test_basic_network_connection vocms0267.cern.ch 4080 WMAgent
-
+bs_test_basic_network_connection cms-frontier.openhtc.io 8080 Frontier
 
 # A local wpad file must be created
 local_wpad_functions="/cvmfs/grid.cern.ch/vc/bin/create_local_wpad"
diff --git a/sbin/glidein_startup_wrapper b/sbin/glidein_startup_wrapper
old mode 100755
new mode 100644
index 789cb1bba41f18ce8186988f50dd144962f0ad74..9f5000b037772b74bf8eaaa3c02e8d5804515e58
--- a/sbin/glidein_startup_wrapper
+++ b/sbin/glidein_startup_wrapper
@@ -1,7 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # glidein_startup.sh command
 glidein_startup.sh -param_MEMORY_USAGE_METRIC .open,.open,ProportionalSetSizeKb.nbsp,.question,.colon,.nbsp,ResidentSetSize.close,.nbsp,.plus,.nbsp,1023.close,.nbsp,/.nbsp,1024 -param_USE_MATCH_AUTH True -sign 6d15bd9cb4a0611d1a24df0441fffaf02d6facdb -clientgroup main -name gfactory_instance -param_SEC_DEFAULT_SESSION_LEASE 86400 -param_UPDATE_COLLECTOR_WITH_TCP True -param_GLIDEIN_Client CMSG-VOLUNTEER.main -param_CONDOR_OS auto -clientdescript description.l49j7v.cfg -clientsigntype sha1 -param_GLIDEIN_Report_Failed NEVER -clientsign e29b4f7fd5725d6371b0324230827ab9a65c10a3 -param_GLIDEIN_Job_Max_Time 14400 -param_NOT_RESPONDING_TIMEOUT 86400 -clientweb http://vocms0840.cern.ch/vofrontend/stage -param_GLIDEIN_Glexec_Use OPTIONAL -factory CERN-ITB -param_GLIDEIN_DEBUG_OPTIONS userjob -schedd UNAVAILABLE -clientsigngroup 3102bbfa1003eac27a30297ce70a32d25f753b69 -v std -param_CCB_HEARTBEAT_INTERVAL 86400 -dir . -param_USE_PSS True -entry CMS_T3_CH_Volunteer -param_GLIDEIN_Max_Idle 1200 -param_GLIDEIN_Monitoring_Enabled False -param_GLIDECLIENT_ReqNode vocms0205.dot,cern.dot,ch -param_CONSUMPTION_POLICY FALSE -slotslayout fixed -param_CONDOR_ARCH default -param_OSG_SINGULARITY_BINARY /cvmfs/oasis.dot,opensciencegrid.dot,org/mis/singularity/3.dot,6.dot,4/bin/singularity -param_STARTD_JOB_ATTRS .dollar,.open,STARTD_JOB_ATTRS.close,.comma,MemoryUsage.comma,ResidentSetSize.comma,ProportionalSetSizeKb -param_GLIDEIN_REQUIRED_OS rhel6 -param_MAX_TIME_SKIP 86400 -param_GLIDEIN_Max_Tail 1200 -signentry 0d129dfa15ca812390c5fce27b72b1956a03c0dd -clientdescriptgroup description.l49j7v.cfg -param_GLIDEIN_Collector vocms0840.dot,cern.dot,ch -descript description.l6bgrf.cfg -descriptentry description.l6bgrf.cfg -param_CMS_GLIDEIN_VERSION 37 -signtype sha1 -clientname CMSG-VOLUNTEER -param_GLIDEIN_CLAIM_WORKLIFE_DYNAMIC cpus.star,.open,6.star,3600.close, -clientwebgroup http://vocms0840.cern.ch/vofrontend/stage/group_main -cluster 0 -param_GLIDEIN_DEBUG_OUTPUT True -submitcredid UNAVAILABLE -param_ENABLE_SSH_TO_JOB False -param_GLIDEIN_Resource_Slots Iotokens.comma,80.comma,.comma,type.eq,main -param_CONDOR_VERSION 8.dot,9.dot,8 -web http://vocms0205.cern.ch/factory/stage -subcluster 0 -param_MIN_DISK_GBS 1
 
-return_value=$?
-sudo boinc-shutdown 0 "glidein exited with return value ${return_value}."
+return_value="$?"
+
+
+# Reward the volunteer even if the scientific app fails.
+# But the subtask must run at least 20 minutes.
+# The good thing: SECONDS does not increase while the VM is suspended.
+
+if [[ "$return_value" == "0" ]]; then
+    boinc_status=0 # reward the volunteer
+else
+    boinc_credit_limit=1200
+    if (( SECONDS > boinc_credit_limit )); then
+        boinc_status=0 # reward the volunteer
+    else
+        boinc_status=208 # EXIT_SUB_TASK_FAILURE
+    fi
+fi
+
+sudo boinc-shutdown $boinc_status "glidein exited with return value ${return_value}."