diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index 7af74ab2bf1e85390e66f6bf7ba9c71c72ead615..5126d7e02595012496b1a3e8cf3eed8845bb2dae 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update && \
     git-core \
     git-lfs \
     gnupg-agent \
+    fzf \
     iputils-ping \
     less \
     nano \
@@ -86,6 +87,7 @@ RUN if [ -f "${ROS_DISTRO}_requirements.txt" ]; \
     # Install apt-get packages
     awk '/^# APT-GET PACKAGES/,/^# PIP PACKAGES/' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs apt-get install -y && \
     # Install pip packages
+    export PIP_BREAK_SYSTEM_PACKAGES=1 && \
     awk '/^# PIP PACKAGES/,0' ${ROS_DISTRO}_requirements.txt | grep -v '^#' | xargs -r -n1 pip install -U ;\
     apt-get clean; \
     fi
@@ -131,7 +133,7 @@ RUN if [ "$ROS_DISTRO" = "jazzy" ]; \
         PIP_BREAK_SYSTEM_PACKAGES=1 pip install -U -f https://www.open3d.org/docs/latest/getting_started.html --only-binary open3d open3d; \
     fi
 
-ARG PEAK_DRIVER=none
+ARG PEAK_DRIVER=install
 RUN if [ "$PEAK_DRIVER" = "install" ]; \
     then \
     apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) \
@@ -148,7 +150,7 @@ RUN if [ "$PEAK_DRIVER" = "install" ]; \
     fi
 
 RUN rm -rf *
-WORKDIR $HOME
+
 # Update this date to re-run the image final update
 LABEL image.date=30-10-2024
 
@@ -175,5 +177,24 @@ ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
 ARG SHELL=/bin/bash
 ENV SHELL="${SHELL}"
 
+# ARG USERNAME=danil
+# ARG USER_UID=1000
+# ARG USER_GID=$USER_UID
+
+# # Delete user if it exists in container (e.g Ubuntu Noble: ubuntu)
+# RUN if id -u $USER_UID ; then userdel `id -un $USER_UID` ; fi
+
+# # Create the user
+# RUN groupadd --gid $USER_GID $USERNAME \
+#     && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+#     #
+#     # [Optional] Add sudo support. Omit if you don't need to install software after connecting.
+#     && apt-get update \
+#     && apt-get install -y sudo \
+#     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+#     && chmod 0440 /etc/sudoers.d/$USERNAME
+
+# USER ${USERNAME}
+
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD $EXT_SHELL