diff --git a/Jenkinsfile b/Jenkinsfile
index a26a10c40..2558d3bf4 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@
 // That PR should be landed with out deleting the PR branch.
 // Then a second PR submitted to comment out the @Library line, and when it
 // is landed, both PR branches can be deleted.
-//@Library(value='pipeline-lib@my_branch_name') _
+@Library(value='pipeline-lib@bmurrell/fix-mpich-loading') _
 
 /* groovylint-disable-next-line CompileStatic */
 job_status_internal = [:]
@@ -80,6 +80,16 @@ String test_branch(String target) {
             '-' + target.replaceAll('/', '-')
 }
 
+def artifacts_selector() {
+    String pragma_val = cachedCommitPragma('libfabric-artifacts-selector', null)
+
+    if (pragma_val) {
+        return specific(pragma_val)
+    }
+
+    return lastSuccessful()
+}
+
 /* groovylint-disable-next-line CompileStatic */
 pipeline {
     agent { label 'lightweight' }
@@ -222,6 +232,7 @@ pipeline {
                     steps {
                         // Populate an artifact directory
                         copyArtifacts projectName: '/daos-stack/libfabric/master',
+                                      selector: artifacts_selector(),
                                       filter: 'artifacts/el8/**',
                                       target: 'artifact'
                         publishToRepository(
@@ -262,6 +273,7 @@ pipeline {
                     steps {
                         // Populate an artifact directory
                         copyArtifacts projectName: '/daos-stack/libfabric/master',
+                                      selector: artifacts_selector(),
                                       filter: 'artifacts/ubuntu20.04/**',
                                       target: 'artifact'
                         publishToRepository(
diff --git a/vars/functionalPackages.groovy b/vars/functionalPackages.groovy
index 75f710c8b..5360a57a6 100644
--- a/vars/functionalPackages.groovy
+++ b/vars/functionalPackages.groovy
@@ -41,7 +41,10 @@ String call(String distro, Integer client_ver, String next_version, String add_d
     } else {
         echo "ci/functional/required_packages.sh doesn't exist.  " +
              'Hopefully the daos-tests packages have the dependencies configured.'
+        sh(label: "Debug",
+           script: 'ls -l ci ci/functional || true; git branch || true')
     }
+    echo "pkgs: " + pkgs
 
     if (distro.startsWith('leap') ||
         distro.startsWith('el') || distro.startsWith('centos') ||