diff --git a/.github/hubcast.yml b/.github/hubcast.yml
index 6e5b357e1..4f9fa548d 100644
--- a/.github/hubcast.yml
+++ b/.github/hubcast.yml
@@ -12,7 +12,7 @@ Repo:
   # Set to [pipeline] for overall pipeline status only
   # Set to [jobs] for individual job statuses only
   # Set to [pipeline, jobs] to report both
-  check_types: [pipeline]
+  check_types: [pipeline, jobs]
 
   # Optional: delete branches from destination when source PR is closed (default: true)
   delete_closed: true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df346c359..16644e5d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,13 @@
 ##############################################################################
 
 variables:
-  #TODO: uncomment this when everyone has service user access across all the machines
-  #LLNL_SERVICE_USER: asmith
+  CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$GITLAB_USER_LOGIN/.jacamar-ci/$CI_PROJECT_NAME"
+  FF_ENABLE_JOB_CLEANUP: "true"
   GIT_STRATEGY: clone
   GIT_SUBMODULE_STRATEGY: recursive
-  PROJECT_ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
-  BUILD_ROOT: ${CI_PROJECT_DIR}
-  FULL_BUILD_ROOT: ${CI_BUILDS_DIR}/smith/${CI_JOB_NAME}
+  JACAMAR_SCHEDULER_JOB_KEY: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
+  CI_BUILDS_DIR: ${CUSTOM_CI_BUILDS_DIR}
+  FULL_BUILD_ROOT: ${CUSTOM_CI_BUILDS_DIR}/smith/${CI_JOB_NAME}
   ALLOC_BANK: eng
   SPOT_DIR: ${BUILD_ROOT}/califiles