diff --git a/dockerfile b/dockerfile
index 3c84d94add8ffb1e10449aeff7ddfc495c6f6b7b..1f065ce059f9d863a2bc1b76670d8de4ecff1d75 100644
--- a/dockerfile
+++ b/dockerfile
@@ -23,6 +23,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 
 #Fetch additional dependencies from Python 2.x pip
 RUN pip install pyyaml
+RUN ln -s /usr/bin/python3 /usr/bin/python && \
+    ln -s /usr/bin/pip3 /usr/bin/pip
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
 #Grab the GNU ARM toolchain from arm.com
 #Then extract contents to /opt/build/armbin/
diff --git a/dockerfile-nogit b/dockerfile-nogit
index faea35d2a0b302977ca2d9fefcf32991b29e9e21..114b6bc8c754a7174eb2b7b116a7c66a265717d3 100644
--- a/dockerfile-nogit
+++ b/dockerfile-nogit
@@ -11,7 +11,7 @@ WORKDIR /havoc/firmware
 
 # Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y git tar wget dfu-util cmake python3 bzip2 ccache curl && \
+	apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 curl && \
 	apt-get -qy autoremove
 
 #Install current pip from PyPa
@@ -20,6 +20,11 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 
 #Fetch additional dependencies from Python 3.x pip
 RUN pip install pyyaml
+RUN ln -s /usr/bin/python3 /usr/bin/python && \
+    ln -s /usr/bin/pip3 /usr/bin/pip
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
 
 # Grab the GNU ARM toolchain from arm.com
 # Then extract contents to /opt/build/armbin/
@@ -33,4 +38,4 @@ RUN mkdir ~/bin && cd ~/bin && \
 	for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
 
 CMD cd .. && cd build && \
-    cmake .. && make firmware
+    cmake .. && make firmware
\ No newline at end of file