diff --git a/dashboard/state_aggregator.py b/dashboard/state_aggregator.py
index c72ab19db..ec4d751ee 100644
--- a/dashboard/state_aggregator.py
+++ b/dashboard/state_aggregator.py
@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
 
 
 # TODO(sang): Move the class to state/state_manager.py.
-# TODO(sang): Remove *State and replaces with Pydantic or protobuf
+# TODO(sang): Remove *State and replaces with Pydantic or protobuf.
 # (depending on API interface standardization).
 class StateAPIManager:
     """A class to query states from data source, caches, and post-processes
diff --git a/release/air_tests/horovod/app_config_master.yaml b/release/air_tests/horovod/app_config_master.yaml
index 2430a5c3b..915dd7b16 100644
--- a/release/air_tests/horovod/app_config_master.yaml
+++ b/release/air_tests/horovod/app_config_master.yaml
@@ -10,8 +10,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install 'ray[tune]'
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip3 install -U git+https://github.com/horovod/horovod.git
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/golden_notebook_tests/dask_xgboost_app_config.yaml b/release/golden_notebook_tests/dask_xgboost_app_config.yaml
index 98336adcc..b49593f11 100755
--- a/release/golden_notebook_tests/dask_xgboost_app_config.yaml
+++ b/release/golden_notebook_tests/dask_xgboost_app_config.yaml
@@ -14,8 +14,7 @@ python:
   conda_packages: [ ]
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   # Upgrade the XGBoost-Ray version in post build commands, otherwise it will be cached in the Anyscale Docker image.
   - echo {{ env["TIMESTAMP"] }}
diff --git a/release/golden_notebook_tests/modin_xgboost_app_config.yaml b/release/golden_notebook_tests/modin_xgboost_app_config.yaml
index 88efa9b7b..bf877b8ab 100755
--- a/release/golden_notebook_tests/modin_xgboost_app_config.yaml
+++ b/release/golden_notebook_tests/modin_xgboost_app_config.yaml
@@ -15,8 +15,7 @@ python:
   conda_packages: [ ]
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   # Upgrade the XGBoost-Ray version in post build commands, otherwise it will be cached in the Anyscale Docker image.
   - echo {{ env["TIMESTAMP"] }}
diff --git a/release/golden_notebook_tests/torch_tune_serve_app_config.yaml b/release/golden_notebook_tests/torch_tune_serve_app_config.yaml
index eed359f00..bdb6d7d61 100755
--- a/release/golden_notebook_tests/torch_tune_serve_app_config.yaml
+++ b/release/golden_notebook_tests/torch_tune_serve_app_config.yaml
@@ -15,6 +15,5 @@ python:
   conda_packages: [ ]
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/jobs_tests/app_config.yaml b/release/jobs_tests/app_config.yaml
index 302b8c59b..6886db208 100644
--- a/release/jobs_tests/app_config.yaml
+++ b/release/jobs_tests/app_config.yaml
@@ -10,6 +10,5 @@ python:
 
 post_build_cmds:
   - 'rm -r wrk || true && git clone https://github.com/wg/wrk.git /tmp/wrk && cd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin'
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/lightgbm_tests/app_config.yaml b/release/lightgbm_tests/app_config.yaml
index bbc4d3808..26aee9f55 100755
--- a/release/lightgbm_tests/app_config.yaml
+++ b/release/lightgbm_tests/app_config.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install ray[default] # Needed for Ray Client to work.
   - pip3 install -U "xgboost<1.5" xgboost_ray petastorm  # Install latest releases, pin xgboost to <1.5
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/lightgbm_tests/app_config_gpu.yaml b/release/lightgbm_tests/app_config_gpu.yaml
index 58014f4a7..ca550586b 100755
--- a/release/lightgbm_tests/app_config_gpu.yaml
+++ b/release/lightgbm_tests/app_config_gpu.yaml
@@ -11,8 +11,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip install -U xgboost xgboost_ray petastorm  # Install latest releases
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - sudo mkdir -p /data || true
diff --git a/release/long_running_distributed_tests/app_config.yaml b/release/long_running_distributed_tests/app_config.yaml
index dc47490b9..c20fa7c1a 100644
--- a/release/long_running_distributed_tests/app_config.yaml
+++ b/release/long_running_distributed_tests/app_config.yaml
@@ -11,6 +11,5 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/long_running_tests/app_config_np.yaml b/release/long_running_tests/app_config_np.yaml
index 1d17214f5..b709a55cc 100644
--- a/release/long_running_tests/app_config_np.yaml
+++ b/release/long_running_tests/app_config_np.yaml
@@ -22,6 +22,5 @@ post_build_cmds:
     - pip3 install ray[all]
     # TODO (Alex): Ideally we would install all the dependencies from the new
     # version too, but pip won't be able to find the new version of ray-cpp.
-    - pip3 uninstall ray -y || true
-    - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+    - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
     - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/microbenchmark/app_config.yaml b/release/microbenchmark/app_config.yaml
index 8fdcd097a..402fda12c 100755
--- a/release/microbenchmark/app_config.yaml
+++ b/release/microbenchmark/app_config.yaml
@@ -7,6 +7,5 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/ml_user_tests/horovod/app_config.yaml b/release/ml_user_tests/horovod/app_config.yaml
index e9be599ce..314512115 100644
--- a/release/ml_user_tests/horovod/app_config.yaml
+++ b/release/ml_user_tests/horovod/app_config.yaml
@@ -10,8 +10,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install 'ray[tune]'
   - pip3 install torch torchvision
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip3 install -U horovod
diff --git a/release/ml_user_tests/horovod/app_config_master.yaml b/release/ml_user_tests/horovod/app_config_master.yaml
index e5045af3c..a7554219c 100644
--- a/release/ml_user_tests/horovod/app_config_master.yaml
+++ b/release/ml_user_tests/horovod/app_config_master.yaml
@@ -10,8 +10,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true  && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install 'ray[tune]'
   - pip3 install torch torchvision
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip3 install -U git+https://github.com/horovod/horovod.git
diff --git a/release/ml_user_tests/ray-lightning/app_config.yaml b/release/ml_user_tests/ray-lightning/app_config.yaml
index 4a6548a41..9fe1bf92e 100644
--- a/release/ml_user_tests/ray-lightning/app_config.yaml
+++ b/release/ml_user_tests/ray-lightning/app_config.yaml
@@ -10,8 +10,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   # Upgrade the Ray Lightning version, otherwise it will be cached in the Anyscale Docker image.
   - echo {{ env["TIMESTAMP"] }}
diff --git a/release/ml_user_tests/ray-lightning/app_config_master.yaml b/release/ml_user_tests/ray-lightning/app_config_master.yaml
index d882fc5f4..1e084de87 100644
--- a/release/ml_user_tests/ray-lightning/app_config_master.yaml
+++ b/release/ml_user_tests/ray-lightning/app_config_master.yaml
@@ -11,8 +11,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   # Upgrade the Ray Lightning version in post build commands, otherwise it will be cached in the Anyscale Docker image.
   - echo {{ env["TIMESTAMP"] }}
diff --git a/release/ml_user_tests/train/app_config.yaml b/release/ml_user_tests/train/app_config.yaml
index ded4c4f0d..00eb7f9a9 100644
--- a/release/ml_user_tests/train/app_config.yaml
+++ b/release/ml_user_tests/train/app_config.yaml
@@ -11,6 +11,5 @@ python:
     conda_packages: [ ]
 
 post_build_cmds:
-    - pip3 uninstall -y ray || true
-    - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+    - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
     - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/ml_user_tests/xgboost/app_config_gpu.yaml b/release/ml_user_tests/xgboost/app_config_gpu.yaml
index 5405ff63b..d7b0621be 100644
--- a/release/ml_user_tests/xgboost/app_config_gpu.yaml
+++ b/release/ml_user_tests/xgboost/app_config_gpu.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U xgboost xgboost_ray petastorm  # Install latest releases, pin xgboost to <1.5
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - sudo mkdir -p /data || true
diff --git a/release/ml_user_tests/xgboost/app_config_gpu_master.yaml b/release/ml_user_tests/xgboost/app_config_gpu_master.yaml
index bcb3db33f..7945cd6ed 100755
--- a/release/ml_user_tests/xgboost/app_config_gpu_master.yaml
+++ b/release/ml_user_tests/xgboost/app_config_gpu_master.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip install -U "git+https://github.com/ray-project/xgboost_ray@master#egg=xgboost_ray" petastorm
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - sudo mkdir -p /data || true
diff --git a/release/nightly_tests/chaos_test/app_config.yaml b/release/nightly_tests/chaos_test/app_config.yaml
index 682c3f599..c15659a96 100644
--- a/release/nightly_tests/chaos_test/app_config.yaml
+++ b/release/nightly_tests/chaos_test/app_config.yaml
@@ -7,7 +7,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/chaos_test/dask_on_ray_app_config_reconstruction.yaml b/release/nightly_tests/chaos_test/dask_on_ray_app_config_reconstruction.yaml
index d51395104..c665b1211 100644
--- a/release/nightly_tests/chaos_test/dask_on_ray_app_config_reconstruction.yaml
+++ b/release/nightly_tests/chaos_test/dask_on_ray_app_config_reconstruction.yaml
@@ -8,7 +8,6 @@ python:
 
 post_build_cmds:
   # - pip install fastparquet
-  - pip3 uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install ray[default]
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/dask_on_ray/dask_on_ray_app_config.yaml b/release/nightly_tests/dask_on_ray/dask_on_ray_app_config.yaml
index fb85464e3..f4098b019 100644
--- a/release/nightly_tests/dask_on_ray/dask_on_ray_app_config.yaml
+++ b/release/nightly_tests/dask_on_ray/dask_on_ray_app_config.yaml
@@ -7,8 +7,7 @@ python:
 
 post_build_cmds:
   # - pip install fastparquet
-  - pip3 uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - echo {{env["DATESTAMP"]}}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/dask_on_ray/large_scale_dask_on_ray_app_config.yaml b/release/nightly_tests/dask_on_ray/large_scale_dask_on_ray_app_config.yaml
index 85ffd694f..964c027a5 100644
--- a/release/nightly_tests/dask_on_ray/large_scale_dask_on_ray_app_config.yaml
+++ b/release/nightly_tests/dask_on_ray/large_scale_dask_on_ray_app_config.yaml
@@ -7,9 +7,8 @@ python:
 
 post_build_cmds:
   # - pip install fastparquet
-  - pip3 uninstall -y ray
   - pip3 install -U pytest
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  -  pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - echo {{env["DATESTAMP"]}}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/dataset/app_config.yaml b/release/nightly_tests/dataset/app_config.yaml
index 947d483f4..613fd9e44 100644
--- a/release/nightly_tests/dataset/app_config.yaml
+++ b/release/nightly_tests/dataset/app_config.yaml
@@ -8,8 +8,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   # TODO (Alex): We need to do this because the ray-ml image pins
   # tensorflow=2.6, which requires numpy~=1.19.2. This is ok because the test
   # doesn't actually use tensorflow, but in the long term, but we should
diff --git a/release/nightly_tests/dataset/pipelined_ingestion_app.yaml b/release/nightly_tests/dataset/pipelined_ingestion_app.yaml
index f9dfd44dc..91f2a9fd1 100644
--- a/release/nightly_tests/dataset/pipelined_ingestion_app.yaml
+++ b/release/nightly_tests/dataset/pipelined_ingestion_app.yaml
@@ -7,8 +7,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip install -U git+https://github.com/ray-project/ray_shuffling_data_loader.git@add-embedding-model
   - pip install ray[default]
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip install -U git+https://github.com/horovod/horovod.git
diff --git a/release/nightly_tests/dataset/pipelined_training_app.yaml b/release/nightly_tests/dataset/pipelined_training_app.yaml
index 02be3a61d..91360f118 100644
--- a/release/nightly_tests/dataset/pipelined_training_app.yaml
+++ b/release/nightly_tests/dataset/pipelined_training_app.yaml
@@ -7,8 +7,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip install -U git+https://github.com/ray-project/ray_shuffling_data_loader.git@add-embedding-model
   - pip install ray[default]
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip install -U git+https://github.com/horovod/horovod.git
diff --git a/release/nightly_tests/dataset/ray_sgd_training_app.yaml b/release/nightly_tests/dataset/ray_sgd_training_app.yaml
index a81291e6e..59a284656 100644
--- a/release/nightly_tests/dataset/ray_sgd_training_app.yaml
+++ b/release/nightly_tests/dataset/ray_sgd_training_app.yaml
@@ -6,8 +6,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-    - pip uninstall -y ray
-    - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+    - pip uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
     - pip3 install llvmlite --ignore-installed
     - pip3 install -U torch==1.6 dask dask_ml mlflow tensorboard torchvision pickle5 s3fs
     - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/dataset/shuffle_app_config.yaml b/release/nightly_tests/dataset/shuffle_app_config.yaml
index a12d6f6cd..50791b5bf 100644
--- a/release/nightly_tests/dataset/shuffle_app_config.yaml
+++ b/release/nightly_tests/dataset/shuffle_app_config.yaml
@@ -7,7 +7,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/decision_tree/decision_tree_app_config.yaml b/release/nightly_tests/decision_tree/decision_tree_app_config.yaml
index a92cd8a1b..61307759e 100644
--- a/release/nightly_tests/decision_tree/decision_tree_app_config.yaml
+++ b/release/nightly_tests/decision_tree/decision_tree_app_config.yaml
@@ -7,8 +7,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - echo {{env["DATESTAMP"]}}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/many_nodes_tests/app_config.yaml b/release/nightly_tests/many_nodes_tests/app_config.yaml
index f68d9458e..803f65d85 100644
--- a/release/nightly_tests/many_nodes_tests/app_config.yaml
+++ b/release/nightly_tests/many_nodes_tests/app_config.yaml
@@ -7,8 +7,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - echo {{env["DATESTAMP"]}}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/placement_group_tests/app_config.yaml b/release/nightly_tests/placement_group_tests/app_config.yaml
index 8503bc36a..028cc7ce2 100644
--- a/release/nightly_tests/placement_group_tests/app_config.yaml
+++ b/release/nightly_tests/placement_group_tests/app_config.yaml
@@ -6,7 +6,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/shuffle/shuffle_app_config.yaml b/release/nightly_tests/shuffle/shuffle_app_config.yaml
index 8503bc36a..028cc7ce2 100644
--- a/release/nightly_tests/shuffle/shuffle_app_config.yaml
+++ b/release/nightly_tests/shuffle/shuffle_app_config.yaml
@@ -6,7 +6,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install -U ray[default]
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/nightly_tests/stress_tests/stress_tests_app_config.yaml b/release/nightly_tests/stress_tests/stress_tests_app_config.yaml
index f581e2067..85c919dee 100644
--- a/release/nightly_tests/stress_tests/stress_tests_app_config.yaml
+++ b/release/nightly_tests/stress_tests/stress_tests_app_config.yaml
@@ -9,8 +9,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install ray[default]
   - echo {{env["DATESTAMP"]}}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/rllib_tests/app_config.yaml b/release/rllib_tests/app_config.yaml
index ceef395ed..aa78f2a0f 100755
--- a/release/rllib_tests/app_config.yaml
+++ b/release/rllib_tests/app_config.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   # TODO(jungong): remove once nightly image gets upgraded.
   - pip install -U pybullet==3.2.0
diff --git a/release/runtime_env_tests/app_config.yaml b/release/runtime_env_tests/app_config.yaml
index 8fdcd097a..e3a9f8e7d 100644
--- a/release/runtime_env_tests/app_config.yaml
+++ b/release/runtime_env_tests/app_config.yaml
@@ -7,6 +7,5 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/serve_tests/app_config.yaml b/release/serve_tests/app_config.yaml
index 70d52859d..767afbff1 100644
--- a/release/serve_tests/app_config.yaml
+++ b/release/serve_tests/app_config.yaml
@@ -10,7 +10,6 @@ python:
 
 post_build_cmds:
   - 'rm -r wrk || true && git clone https://github.com/wg/wrk.git /tmp/wrk && cd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin'
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - pip install pytest
diff --git a/release/train_tests/horovod/app_config.yaml b/release/train_tests/horovod/app_config.yaml
index e9be599ce..314512115 100644
--- a/release/train_tests/horovod/app_config.yaml
+++ b/release/train_tests/horovod/app_config.yaml
@@ -10,8 +10,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip3 uninstall ray -y || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall ray -y || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install 'ray[tune]'
   - pip3 install torch torchvision
   - HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_TENSORFLOW=1 HOROVOD_WITHOUT_MXNET=1 HOROVOD_WITH_PYTORCH=1 pip3 install -U horovod
diff --git a/release/tune_tests/cloud_tests/app_config.yaml b/release/tune_tests/cloud_tests/app_config.yaml
index 5ea5f7125..6a2296c4c 100755
--- a/release/tune_tests/cloud_tests/app_config.yaml
+++ b/release/tune_tests/cloud_tests/app_config.yaml
@@ -14,7 +14,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
   # Install Ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/tune_tests/cloud_tests/app_config_ml.yaml b/release/tune_tests/cloud_tests/app_config_ml.yaml
index 661dbf9ce..fb328a598 100755
--- a/release/tune_tests/cloud_tests/app_config_ml.yaml
+++ b/release/tune_tests/cloud_tests/app_config_ml.yaml
@@ -14,7 +14,6 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
   # Install Ray
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/tune_tests/scalability_tests/app_config.yaml b/release/tune_tests/scalability_tests/app_config.yaml
index 38d0ac850..e552178aa 100755
--- a/release/tune_tests/scalability_tests/app_config.yaml
+++ b/release/tune_tests/scalability_tests/app_config.yaml
@@ -11,6 +11,5 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/tune_tests/scalability_tests/app_config_data.yaml b/release/tune_tests/scalability_tests/app_config_data.yaml
index c42263f6e..09ad6e68a 100755
--- a/release/tune_tests/scalability_tests/app_config_data.yaml
+++ b/release/tune_tests/scalability_tests/app_config_data.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - sudo mkdir -p /data || true
   - sudo chown ray:1000 /data || true
diff --git a/release/xgboost_tests/app_config.yaml b/release/xgboost_tests/app_config.yaml
index 4b4a04ee0..8c8108878 100755
--- a/release/xgboost_tests/app_config.yaml
+++ b/release/xgboost_tests/app_config.yaml
@@ -12,8 +12,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip3 install ray[default] # Needed for Ray Client to work.
   - pip3 install -U "xgboost<1.5" xgboost_ray petastorm  # Install latest releases, pin xgboost to <1.5
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
diff --git a/release/xgboost_tests/app_config_gpu.yaml b/release/xgboost_tests/app_config_gpu.yaml
index 2e666fe14..a685ed8e3 100755
--- a/release/xgboost_tests/app_config_gpu.yaml
+++ b/release/xgboost_tests/app_config_gpu.yaml
@@ -11,8 +11,7 @@ python:
   conda_packages: []
 
 post_build_cmds:
-  - pip uninstall -y ray || true
-  - pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
+  - pip3 uninstall -y ray || true && pip3 install -U {{ env["RAY_WHEELS"] | default("ray") }}
   - pip install -U xgboost xgboost_ray petastorm  # Install latest releases
   - {{ env["RAY_WHEELS_SANITY_CHECK"] | default("echo No Ray wheels sanity check") }}
   - sudo mkdir -p /data || true