diff --git a/Dockerfile b/Dockerfile
index ec053ce90a..92900c67cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,13 @@ LABEL org.opencontainers.image.source="https://github.com/pypeclub/pype"
 
 USER root
 
-RUN yum -y update \
-	&& yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+# update base
+RUN yum -y install deltarpm \
+    && yum -y update \
+    && yum clean all
+
+# add tools we need
+RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     && yum -y install centos-release-scl \
     && yum -y install \
         bash \
@@ -42,10 +47,11 @@ RUN curl https://pyenv.run | bash
 ENV PYTHON_CONFIGURE_OPTS --enable-shared
 
 RUN echo 'export PATH="$HOME/.pyenv/bin:$PATH"'>> $HOME/.bashrc \
+    && echo "alias pyhon3='python'" >> $HOME/.bashrc \
     && echo 'eval "$(pyenv init -)"' >> $HOME/.bashrc \
     && echo 'eval "$(pyenv virtualenv-init -)"' >> $HOME/.bashrc \
     && echo -e "eval \"$(pyenv init --path)\"\n$(cat $HOME/.profile)" > $HOME/.profile
-RUN cat $HOME/.bashrc && source $HOME/.bashrc && pyenv install ${OPENPYPE_PYTHON_VERSION}
+RUN source $HOME/.bashrc && pyenv install ${OPENPYPE_PYTHON_VERSION}
 
 COPY . /opt/openpype/
 # USER root
diff --git a/tools/build.sh b/tools/build.sh
index 0510447e07..953d51bd81 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -73,7 +73,7 @@ detect_python () {
   local version_command
   version_command="import sys;print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))"
   local python_version
-  python_version="$(python3 <<< ${version_command})"
+  python_version="$(python <<< ${version_command})"
   oIFS="$IFS"
   IFS=.
   set -- $python_version
@@ -85,7 +85,7 @@ detect_python () {
       echo -e "${BIWhite}[${RST} ${BIGreen}$1.$2${RST} ${BIWhite}]${RST}"
     fi
   else
-    command -v python3 >/dev/null 2>&1 || { echo -e "${BIRed}$1.$2$ - ${BIRed}FAILED${RST} ${BIYellow}Version is old and unsupported${RST}"; return 1; }
+    command -v python >/dev/null 2>&1 || { echo -e "${BIRed}$1.$2$ - ${BIRed}FAILED${RST} ${BIYellow}Version is old and unsupported${RST}"; return 1; }
   fi
 }
 
@@ -131,7 +131,7 @@ realpath () {
 install_poetry () {
   echo -e "${BIGreen}>>>${RST} Installing Poetry ..."
   command -v curl >/dev/null 2>&1 || { echo -e "${BIRed}!!!${RST}${BIYellow} Missing ${RST}${BIBlue}curl${BIYellow} command.${RST}"; return 1; }
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 -
+  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
 }
 
 # Main
@@ -146,7 +146,7 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   version_command="import os;exec(open(os.path.join('$openpype_root', 'openpype', 'version.py')).read());print(__version__);"
-  openpype_version="$(python3 <<< ${version_command})"
+  openpype_version="$(python <<< ${version_command})"
 
   _inside_openpype_tool="1"
 
@@ -177,11 +177,11 @@ main () {
 
   echo -e "${BIGreen}>>>${RST} Building ..."
   if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    poetry run python3 "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    poetry run python "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
   elif [[ "$OSTYPE" == "darwin"* ]]; then
-    poetry run python3 "$openpype_root/setup.py" bdist_mac > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    poetry run python "$openpype_root/setup.py" bdist_mac > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
   fi
-  poetry run python3 "$openpype_root/tools/build_dependencies.py"
+  poetry run python "$openpype_root/tools/build_dependencies.py"
 
   if [[ "$OSTYPE" == "darwin"* ]]; then
     # fix code signing issue
diff --git a/tools/create_env.sh b/tools/create_env.sh
index a29139d884..81f0b3b0b0 100755
--- a/tools/create_env.sh
+++ b/tools/create_env.sh
@@ -89,7 +89,7 @@ done
 detect_python () {
   echo -e "${BIGreen}>>>${RST} Using python \c"
   local version_command="import sys;print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))"
-  local python_version="$(python3 <<< ${version_command})"
+  local python_version="$(python <<< ${version_command})"
   oIFS="$IFS"
   IFS=.
   set -- $python_version
@@ -101,7 +101,7 @@ detect_python () {
       echo -e "${BIWhite}[${RST} ${BIGreen}$1.$2${RST} ${BIWhite}]${RST}"
     fi
   else
-    command -v python3 >/dev/null 2>&1 || { echo -e "${BIRed}$1.$2$ - ${BIRed}FAILED${RST} ${BIYellow}Version is old and unsupported${RST}"; return 1; }
+    command -v python >/dev/null 2>&1 || { echo -e "${BIRed}$1.$2$ - ${BIRed}FAILED${RST} ${BIYellow}Version is old and unsupported${RST}"; return 1; }
   fi
 }
 
diff --git a/tools/docker_build.sh b/tools/docker_build.sh
index e3ce9a04c0..e7caa57bcc 100755
--- a/tools/docker_build.sh
+++ b/tools/docker_build.sh
@@ -5,6 +5,7 @@
 RST='\033[0m'             # Text Reset
 BIGreen='\033[1;92m'      # Green
 BIYellow='\033[1;93m'     # Yellow
+BIRed='\033[1;91m'        # Red
 
 ##############################################################################
 # Return absolute path
@@ -32,14 +33,28 @@ main () {
 
   echo -e "${BIGreen}>>>${RST} Running docker build ..."
   docker build -t pypeclub/openpype:$openpype_version .
+  if [ $? -ne 0 ] ; then
+    echo -e "${BIRed}!!!${RST} Docker build failed."
+    return 1
+  fi
 
   echo -e "${BIGreen}>>>${RST} Copying build from container ..."
   echo -e "${BIYellow}---${RST} Creating container from pypeclub/openpype:$openpype_version ..."
   id="$(docker create -ti pypeclub/openpype:$openpype_version bash)"
+  if [ $? -ne 0 ] ; then
+    echo -e "${BIRed}!!!${RST} Cannot create just built container."
+    return 1
+  fi
   echo -e "${BIYellow}---${RST} Copying ..."
   docker cp "$id:/opt/openpype/build/exe.linux-x86_64-3.7" "$openpype_root/build"
+  if [ $? -ne 0 ] ; then
+    echo -e "${BIRed}!!!${RST} Copying failed."
+    return 1
+  fi
   echo -e "${BIGreen}>>>${RST} All done, you can delete container:"
   echo -e "${BIYellow}$id${RST}"
 }
 
-main
+return_code=0
+main || return_code=$?
+exit $return_code