diff --git a/Dockerfile b/Dockerfile
index 62d4583..65cf63a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,6 +71,8 @@ ENV HOSTNAME="casjaysdev-archlinux"
 USER ${USER}
 WORKDIR /root
 
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
+
 RUN set -e; \
   echo "Setting up prerequisites"; \
   pacman -Sy --noconfirm archlinux-keyring; \
@@ -80,14 +82,14 @@ RUN set -e; \
   pacman -Sy --noconfirm bash; \
   SH_CMD="$(which sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && { rm -Rf "$SH_CMD"|| true ;ln -s "$BASH_CMD" "$SH_CMD"; } || true; \
-  [ -x "$BASH_CMD" ] &&  { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || true; \
-  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
+  [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \
+  [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \
+  [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
 SHELL [ "/bin/bash", "-c" ]
 
-COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \