diff --git a/ci-builds/pmix/01-build-hwloc1x.sh b/ci-builds/pmix/01-build-hwloc1x.sh
deleted file mode 100755
index 9542157..0000000
--- a/ci-builds/pmix/01-build-hwloc1x.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash -ex
-
-#
-# Regression test related to
-#  https://github.com/openpmix/openpmix/issues/2057
-#
-
-#--------------------------------
-# Sanity Checks
-#--------------------------------
-if [ -z "${_PMIX_CHECKOUT}" ]; then
-    echo "Error: No PMIx checkout"
-    # git clone https://github.com/openpmix/openpmix.git
-    exit 1
-fi
-
-if [ ! -d ${_PMIX_CHECKOUT} ] ; then
-    echo "Error: No PMIx checkout in ${_PMIX_CHECKOUT}"
-    echo "Set the _PMIX_CHECKOUT envar to your pmix checkout"
-    exit 1
-fi
-
-#--------------------------------
-# Setup a clean build location
-#--------------------------------
-if [ -z "${_BUILD_DIR}" ]; then
-    _BUILD_DIR=`mktemp -d $HOME/tmp-build-XXXXX`
-fi
-
-cd $_BUILD_DIR
-
-cp -R ${_PMIX_CHECKOUT} .
-cd `basename ${_PMIX_CHECKOUT}`
-
-#--------------------------------
-# Autogen
-#--------------------------------
-export AUTOMAKE_JOBS=20
-./autogen.pl
-
-#--------------------------------
-# Configure
-#--------------------------------
-./configure --prefix=${_BUILD_DIR}/install \
-            --disable-debug \
-            --enable-static \
-            --enable-shared \
-            --disable-visibility \
-            --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
-
-#--------------------------------
-# Make
-#--------------------------------
-make -j 10
-
-#--------------------------------
-# Make Install
-#--------------------------------
-make -j 10 install
-
-exit 0
diff --git a/ci-builds/pmix/05-build-v4-with-prrte.sh b/ci-builds/pmix/05-build-v4-with-prrte.sh
index 20580cc..018d578 100755
--- a/ci-builds/pmix/05-build-v4-with-prrte.sh
+++ b/ci-builds/pmix/05-build-v4-with-prrte.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -ex
 
 #
-# PRRTE requires a minimum of OpenPMIx v4.0.x
-# If we change PMIx v4.0 branch then check to make
+# PRRTE requires a minimum of OpenPMIx v4.2.x
+# If we change PMIx v4.2 branch then check to make
 # sure that PRRTE still builds correctly.
 #
 
@@ -23,9 +23,9 @@ if [ ! -d ${_PMIX_CHECKOUT} ] ; then
     exit 1
 fi
 
-# Only run if we are modifying the v4.0 branch
+# Only run if we are modifying the v4.2 branch
 if [ -n "$PR_TARGET_BRANCH" ] ; then
-    if [[ "$PR_TARGET_BRANCH" != "v4.0" ]] ; then
+    if [[ "$PR_TARGET_BRANCH" != "v4.2" ]] ; then
         echo "Warning: This build does not work for this branch"
         exit 0
     fi
@@ -58,7 +58,7 @@ export AUTOMAKE_JOBS=20
 ./configure --prefix=${_BUILD_DIR}/install-pmix \
             --disable-debug \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -91,7 +91,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
diff --git a/ci-builds/prrte/01-build-hwloc1x.sh b/ci-builds/prrte/01-build-hwloc1x.sh
index 8c51c23..4099667 100755
--- a/ci-builds/prrte/01-build-hwloc1x.sh
+++ b/ci-builds/prrte/01-build-hwloc1x.sh
@@ -62,7 +62,7 @@ export AUTOMAKE_JOBS=20
             --enable-static \
             --enable-shared \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -95,7 +95,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
diff --git a/ci-builds/prrte/02-build-w-pmix-v4.0.sh b/ci-builds/prrte/02-build-w-pmix-v4.0.sh
index c21c23a..5d8e913 100755
--- a/ci-builds/prrte/02-build-w-pmix-v4.0.sh
+++ b/ci-builds/prrte/02-build-w-pmix-v4.0.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 #
-# PRRTE requires a minimum of OpenPMIx v4.2.2
+# PRRTE requires a minimum of OpenPMIx v4.2.4
 #
 
 #--------------------------------
@@ -33,11 +33,15 @@ cd $_BUILD_DIR
 #--------------------------------
 # PMIx Build
 #--------------------------------
-if [ -n "$PR_TARGET_BRANCH" ] &&  [ "$PR_TARGET_BRANCH" == "v3.0" ] ; then
-  git clone -b v4.2 --recurse-submodules https://github.com/openpmix/openpmix.git
+if [ -n "$PR_TARGET_BRANCH" ] ; then
+    if [ "$PR_TARGET_BRANCH" == "v3.0" ] || [ "$PR_TARGET_BRANCH" == "v3.1" ] ; then
+        git clone -b v4.2 --recurse-submodules https://github.com/openpmix/openpmix.git
+    else
+        # no need to do another build as we have tested against pmix master elsewhere
+        exit 0
+    fi
 else
-  # no need to do another build as we have tested against pmix master elsewhere
-  exit 0
+    exit 0
 fi
 cd openpmix
 
@@ -53,7 +57,7 @@ export AUTOMAKE_JOBS=20
 ./configure --prefix=${_BUILD_DIR}/install-pmix \
             --disable-debug \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -86,7 +90,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make