diff --git a/atk.env b/atk.env
index 41b4ca50..59f6b27b 100644
--- a/atk.env
+++ b/atk.env
@@ -1,4 +1,4 @@
 ROS_DISTRO=humble
 
-DEFAULT_APT_DEPENDENCIES=" bash vim git git-lfs python3-pip "
+DEFAULT_APT_DEPENDENCIES="bash vim git git-lfs python3-pip"
 DEFAULT_PIP_REQUIREMENTS=""
diff --git a/atk.yml b/atk.yml
index 8f7374e0..81951255 100644
--- a/atk.yml
+++ b/atk.yml
@@ -36,7 +36,7 @@ services:
         USER_UID: "${USER_UID:-1000}"
         USER_GID: "${USER_GID:-1000}"
         APT_DEPENDENCIES: "${DEFAULT_APT_DEPENDENCIES:-}"
-        PIP_REQUIREMENTS: "${DEFAULT_APT_REQUIREMENTS:-}"
+        PIP_REQUIREMENTS: "${DEFAULT_PIP_REQUIREMENTS:-}"
     working_dir: "/home/${COMPOSE_PROJECT_NAME}/${COMPOSE_PROJECT_NAME}"
     volumes:
       - "./:/home/${COMPOSE_PROJECT_NAME}/${COMPOSE_PROJECT_NAME}"
@@ -53,7 +53,7 @@ services:
         IMAGE_TAG: "22.04"
         USER_GROUPS: "dialout video"
         USER_SHELL_ADD_ONS: ". /home/${COMPOSE_PROJECT_NAME}/${COMPOSE_PROJECT_NAME}/workspace/install/setup.bash"
-        PIP_REQUIREMENTS: "tensorrt"
+        PIP_REQUIREMENTS: "${DEFAULT_APT_DEPENDENCIES} tensorrt"
         ROSDEP_METAPACKAGE: "art_dev_meta"
     working_dir: "/home/${COMPOSE_PROJECT_NAME}/${COMPOSE_PROJECT_NAME}/workspace"
   art5:
diff --git a/docker/common/common.dockerfile b/docker/common/common.dockerfile
index 75fd0208..6d6224ea 100644
--- a/docker/common/common.dockerfile
+++ b/docker/common/common.dockerfile
@@ -5,7 +5,7 @@
 # Install dependencies
 ARG APT_DEPENDENCIES=""
 RUN apt-get update && \
-        [[ -z "${APT_DEPENDENCIES// /}" ]] || apt-get install --no-install-recommends -y ${APT_DEPENDENCIES} && \
+        [ -z "${APT_DEPENDENCIES}" ] || apt-get install --no-install-recommends -y ${APT_DEPENDENCIES} && \
         apt-get clean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 
 # Update apt such that it never runs without --no-install-recommends
@@ -13,11 +13,11 @@ RUN apt-config dump | grep -we Recommends -e Suggests | sed s/1/0/ | sudo tee /e
 
 # Install python packages
 ARG PIP_REQUIREMENTS=""
-RUN [[ -z "${PIP_REQUIREMENTS// /}" ]] || pip install --no-cache-dir ${PIP_REQUIREMENTS}
+RUN [ -z "${PIP_REQUIREMENTS}" ] || pip install --no-cache-dir ${PIP_REQUIREMENTS}
 
 # Update shell config
 ARG DEFAULT_SHELL_ADD_ONS="export TERM=xterm-256color"
 ARG USER_SHELL_ADD_ONS=""
 RUN echo "${DEFAULT_SHELL_ADD_ONS}" >> ${USERSHELLPROFILE} && \
         sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' ${USERSHELLPROFILE} && \
-        [[ -z "${USER_SHELL_ADD_ONS// /}" ]] || echo "${USER_SHELL_ADD_ONS}" >> ${USERSHELLPROFILE}
+        [ -z "${USER_SHELL_ADD_ONS}" ] || echo "${USER_SHELL_ADD_ONS}" >> ${USERSHELLPROFILE}
diff --git a/docker/snippets/rosdep.dockerfile b/docker/snippets/rosdep.dockerfile
index 6c3aa084..7149c922 100644
--- a/docker/snippets/rosdep.dockerfile
+++ b/docker/snippets/rosdep.dockerfile
@@ -20,7 +20,7 @@ COPY ${ROS_WORKSPACE}/src /tmp/workspace/src
 RUN . ${ROS_INSTALL_PREFIX}/setup.sh && \
     cd /tmp/workspace && \
     apt-get update && \
-    if [[ -z "${ROSDEP_METAPACKAGE}" ]]; then \
+    if [ -z "${ROSDEP_METAPACKAGE}" ]; then \
         ROSDEP_FROM_PATHS="src"; \
     else \
         ROSDEP_FROM_PATHS=$(colcon list --packages-up-to ${ROSDEP_METAPACKAGE} | awk '{print $2}' | tr '\n' ' '); \