diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4377602ebfc0..d455a1450068 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -43,9 +43,8 @@ repos:
         - id: check-merge-conflict
         - id: check-yaml
         - id: end-of-file-fixer
-          stages: [pre-push]
         - id: trailing-whitespace
-          stages: [pre-push]
+
     - repo: local
       hooks:
         -   id: run-black
diff --git a/docker/dev_common.sh b/docker/dev_common.sh
index 763da67ef854..fd5a8f91bd1d 100755
--- a/docker/dev_common.sh
+++ b/docker/dev_common.sh
@@ -27,8 +27,7 @@ INVOCATION_PWD="$(pwd)"
 
 GIT_TOPLEVEL=$(cd $(dirname ${BASH_SOURCE[0]}) && git rev-parse --show-toplevel)
 
-DOCKER_IS_ROOTLESS=$(docker info 2> /dev/null | grep 'Context: \+rootless')
-
+DOCKER_IS_ROOTLESS=$(docker info 2> /dev/null | grep 'Context: \+rootless' || true)
 
 function lookup_image_spec() {
     img_spec=$(python3 "${GIT_TOPLEVEL}/ci/jenkins/data.py" "$1")