diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh
index 030d30cbc5b6..a28cea5acdbb 100755
--- a/scripts/setup-centos9.sh
+++ b/scripts/setup-centos9.sh
@@ -89,19 +89,21 @@ function install_glog {
 function install_lzo {
   wget_and_untar http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz lzo
   (
-    cd lzo
+    pushd lzo
     ./configure --prefix=/usr --enable-shared --disable-static --docdir=/usr/share/doc/lzo-2.10
     make "-j$(nproc)"
     make install
+    popd
   )
 }
 
 function install_boost {
   wget_and_untar https://github.com/boostorg/boost/releases/download/${BOOST_VERSION}/${BOOST_VERSION}.tar.gz boost
   (
-   cd boost
+   pushd boost
    ./bootstrap.sh --prefix=/usr/local
    ./b2 "-j$(nproc)" -d0 install threading=multi --without-python
+   popd
   )
 }
 
@@ -118,11 +120,12 @@ function install_fmt {
 function install_protobuf {
   wget_and_untar https://github.com/protocolbuffers/protobuf/releases/download/v21.8/protobuf-all-21.8.tar.gz protobuf
   (
-    cd protobuf
+    pushd protobuf
     ./configure --prefix=/usr
     make "-j${NPROC}"
     make install
     ldconfig
+    popd
   )
 }
 
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index e367e239a3da..3d7e89ac87f2 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -101,9 +101,10 @@ function install_fmt {
 function install_boost {
   wget_and_untar https://github.com/boostorg/boost/releases/download/${BOOST_VERSION}/${BOOST_VERSION}.tar.gz boost
   (
-   cd boost
+   pushd boost
    ./bootstrap.sh --prefix=/usr/local
    ${SUDO} ./b2 "-j$(nproc)" -d0 install threading=multi --without-python
+   popd
   )
 }