diff --git a/Dockerfile b/Dockerfile
index 14c326179..05c38639e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,11 +9,20 @@
 #
 FROM ubuntu:20.04
 
+ENV TZ=America/New_York
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
+    apt-get update && \
+    apt-get -y install vim golang
+
 ADD . /pwndbg/
-RUN cd /pwndbg && DEBIAN_FRONTEND=noninteractive ./setup.sh
-RUN echo 'source /pwndbg/gdbinit.py' >> ~/.gdbinit.py
 
-# Python3 path exporting
-RUN echo 'PYTHON_MINOR=$(python3 -c "import sys;print(sys.version_info.minor)")' >> /root/.bashrc
-RUN echo 'PYTHON_PATH="/usr/local/lib/python3.${PYTHON_MINOR}/dist-packages/bin"' >> /root/.bashrc
-RUN echo 'export PATH=$PATH:$PYTHON_PATH' >> /root/.bashrc
+RUN cd /pwndbg && \
+    DEBIAN_FRONTEND=noninteractive ./setup.sh
+
+RUN echo "source /pwndbg/gdbinit.py" >> ~/.gdbinit.py && \
+    echo "PYTHON_MINOR=$(python3 -c "import sys;print(sys.version_info.minor)")" >> /root/.bashrc && \
+    echo "PYTHON_PATH=\"/usr/local/lib/python3.${PYTHON_MINOR}/dist-packages/bin\"" >> /root/.bashrc && \
+    echo "export PATH=$PATH:$PYTHON_PATH" >> /root/.bashrc && \
+    cat ~/.gdbinit.py | grep -i source && \
+    cat /root/.bashrc | grep -i python