diff --git a/dockerfiles/DevenvMelodic.Dockerfile b/dockerfiles/DevenvMelodic.Dockerfile
index 4dda1ac3af67ef73e742fb63a10e4ea4e7384022..ff8f4ed5b695af6fd6def1fe103c0a7181d45378 100644
--- a/dockerfiles/DevenvMelodic.Dockerfile
+++ b/dockerfiles/DevenvMelodic.Dockerfile
@@ -42,12 +42,12 @@ RUN apt-get -y install --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # Install docker-ce
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-RUN add-apt-repository \
-    "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-RUN apt-get update && apt-get -y install --no-install-recommends \
-    docker-ce-cli \
-    && rm -rf /var/lib/apt/lists/*
+#RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+#RUN add-apt-repository \
+#    "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+#RUN apt-get update && apt-get -y install --no-install-recommends \
+#    docker-ce-cli \
+#    && rm -rf /var/lib/apt/lists/*
 
 # Configure system to look for debian packages in the Artifactory repository
 ARG USER_API_KEY_ARTIFACTS_TECNALIA
@@ -160,43 +160,41 @@ RUN apt-get install -y \
     ros-melodic-joy
 
 RUN apt-get update && apt-get install -y \
-spacenavd \
-ros-melodic-spacenav-node \
-ros-melodic-ros-control
+    #spacenavd \
+    #ros-melodic-spacenav-node \
+    ros-melodic-ros-control \
+    ros-melodic-rqt-controller-manager \
+    systemd
 
-RUN apt-get update && apt-get install -y \
-ros-melodic-rqt-controller-manager \
-systemd
+#RUN wget https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-telicam-driver_3.0.1.1-1_amd64.deb \
+#         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid_1.8.3+96f35dc6-1_amd64.deb \
+#         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-studio_1.8.3+96f35dc6-1_amd64.deb \
+#         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-tools_1.8.3+96f35dc6-1_amd64.deb
 
-RUN wget https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-telicam-driver_3.0.1.1-1_amd64.deb \
-         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid_1.8.3+96f35dc6-1_amd64.deb \
-         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-studio_1.8.3+96f35dc6-1_amd64.deb \
-         https://www.zivid.com/hubfs/softwarefiles/releases/1.8.3+96f35dc6-1/u18/zivid-tools_1.8.3+96f35dc6-1_amd64.deb
+#RUN dpkg -i zivid*.deb
 
-RUN dpkg -i zivid*.deb
+#RUN mv /usr/include/flann/ext/lz4.h /usr/include/flann/ext/lz4.h.bak
+#RUN mv /usr/include/flann/ext/lz4hc.h /usr/include/flann/ext/lz4.h.bak
 
-RUN mv /usr/include/flann/ext/lz4.h /usr/include/flann/ext/lz4.h.bak
-RUN mv /usr/include/flann/ext/lz4hc.h /usr/include/flann/ext/lz4.h.bak
+#RUN ln -s /usr/include/lz4.h /usr/include/flann/ext/lz4.h
+#RUN ln -s /usr/include/lz4hc.h /usr/include/flann/ext/lz4hc.h
 
-RUN ln -s /usr/include/lz4.h /usr/include/flann/ext/lz4.h
-RUN ln -s /usr/include/lz4hc.h /usr/include/flann/ext/lz4hc.h
+RUN apt-get update && apt-get install -y \
+    ros-melodic-moveit-resources \
+    ros-melodic-moveit-visual-tools \
+    ros-melodic-moveit-opw-kinematics-plugin \
+    ros-melodic-rqt-joint-trajectory-controller \
+    ros-melodic-ros-controllers \
+    python-mock \
+    python-funcsigs \
+    clang-format
 
 RUN apt-get update && apt-get install -y \
-ros-melodic-moveit-resources \
-ros-melodic-moveit-visual-tools \
-ros-melodic-moveit-opw-kinematics-plugin \
-ros-melodic-rqt-joint-trajectory-controller \
-ros-melodic-ros-controllers \
-python-mock \
-python-funcsigs \
-clang-format
-
-RUN apt-get update && apt-get install -y \ 
-ros-melodic-imu-tools \
-ros-melodic-interactive-marker-twist-server \
-ros-melodic-industrial-core \
-ros-melodic-lms1xx \
-ros-melodic-serial
+    ros-melodic-imu-tools \
+    ros-melodic-interactive-marker-twist-server \
+    ros-melodic-industrial-core \
+    ros-melodic-lms1xx \
+    ros-melodic-serial
 
 # Update final image
 RUN apt-get update && apt-get -y upgrade && apt-get -y autoremove
diff --git a/dotfiles/system.bash b/dotfiles/system.bash
index ff8b4315e8fb86ad2700ebae01971537afcb5aa4..381988ff4871fc14b68602f2091272af25b8769f 100644
--- a/dotfiles/system.bash
+++ b/dotfiles/system.bash
@@ -1,7 +1,10 @@
-# Manual aliases
+# Directories
 alias ll='lsd -lh --group-dirs=first'
 alias la='lsd -a --group-dirs=first'
 alias l='lsd --group-dirs=first'
 alias lla='lsd -lha --group-dirs=first'
 alias ls='lsd --group-dirs=first'
+# Files
 alias cat='bat'
+# Python
+alias ipy='ipython'
\ No newline at end of file