diff --git a/tools/build.sh b/tools/build.sh
index aa8f0121ea..c44e7157af 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -140,21 +140,6 @@ realpath () {
   echo $(cd $(dirname "$1") || return; pwd)/$(basename "$1")
 }
 
-##############################################################################
-# Install Poetry when needed
-# Globals:
-#   PATH
-# Arguments:
-#   None
-# Returns:
-#   None
-###############################################################################
-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 | python -
-}
-
 # Main
 main () {
   echo -e "${BGreen}"
@@ -171,11 +156,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIYellow}---${RST} Cleaning build directory ..."
   rm -rf "$openpype_root/build" && mkdir "$openpype_root/build" > /dev/null
@@ -201,11 +184,11 @@ if [ "$disable_submodule_update" == 1 ]; then
   fi
   echo -e "${BIGreen}>>>${RST} Building ..."
   if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    poetry run python "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    "$POETRY_HOME/bin/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 python "$openpype_root/setup.py" bdist_mac > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    "$POETRY_HOME/bin/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 python "$openpype_root/tools/build_dependencies.py"
+  "$POETRY_HOME/bin/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 226a26e199..cc9eddc317 100755
--- a/tools/create_env.sh
+++ b/tools/create_env.sh
@@ -109,8 +109,7 @@ install_poetry () {
   echo -e "${BIGreen}>>>${RST} Installing Poetry ..."
   export POETRY_HOME="$openpype_root/.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 | python -
-  export PATH="$PATH:$POETRY_HOME/bin"
+  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
 }
 
 ##############################################################################
@@ -154,11 +153,10 @@ main () {
 
   # Directories
   openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))
-  # make sure Poetry is in PATH
+
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
@@ -177,7 +175,7 @@ main () {
     echo -e "${BIGreen}>>>${RST} Installing dependencies ..."
   fi
 
-  poetry install --no-root $poetry_verbosity || { echo -e "${BIRed}!!!${RST} Poetry environment installation failed"; return; }
+  "$POETRY_HOME/bin/poetry" install --no-root $poetry_verbosity || { echo -e "${BIRed}!!!${RST} Poetry environment installation failed"; return; }
 
   echo -e "${BIGreen}>>>${RST} Cleaning cache files ..."
   clean_pyc
@@ -186,10 +184,10 @@ main () {
   # cx_freeze will crash on missing __pychache__ on these but
   # reinstalling them solves the problem.
   echo -e "${BIGreen}>>>${RST} Fixing pycache bug ..."
-  poetry run python -m pip install --force-reinstall pip
-  poetry run pip install --force-reinstall setuptools
-  poetry run pip install --force-reinstall wheel
-  poetry run python -m pip install --force-reinstall pip
+  "$POETRY_HOME/bin/poetry" run python -m pip install --force-reinstall pip
+  "$POETRY_HOME/bin/poetry" run pip install --force-reinstall setuptools
+  "$POETRY_HOME/bin/poetry" run pip install --force-reinstall wheel
+  "$POETRY_HOME/bin/poetry" run python -m pip install --force-reinstall pip
 }
 
 main -3
diff --git a/tools/create_zip.sh b/tools/create_zip.sh
index ec0276b040..85ee18a839 100755
--- a/tools/create_zip.sh
+++ b/tools/create_zip.sh
@@ -114,11 +114,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -134,7 +132,7 @@ main () {
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
   PYTHONPATH="$openpype_root:$PYTHONPATH"
   OPENPYPE_ROOT="$openpype_root"
-  poetry run python3 "$openpype_root/tools/create_zip.py" "$@"
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/tools/create_zip.py" "$@"
 }
 
 main "$@"
diff --git a/tools/fetch_thirdparty_libs.sh b/tools/fetch_thirdparty_libs.sh
index 31f109ba68..93d0674965 100755
--- a/tools/fetch_thirdparty_libs.sh
+++ b/tools/fetch_thirdparty_libs.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# Run Pype Tray
-
-
 art () {
   cat <<-EOF
 
@@ -82,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -100,7 +95,7 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running Pype tool ..."
-  poetry run python "$openpype_root/tools/fetch_thirdparty_libs.py"
+  "$POETRY_HOME/bin/poetry" run python "$openpype_root/tools/fetch_thirdparty_libs.py"
 }
 
 main
\ No newline at end of file
diff --git a/tools/make_docs.sh b/tools/make_docs.sh
index 9dfab26a38..52ee57dcf0 100755
--- a/tools/make_docs.sh
+++ b/tools/make_docs.sh
@@ -83,11 +83,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -101,11 +99,11 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running apidoc ..."
-  poetry run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" igniter
-  poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" openpype vendor, openpype\vendor
+  "$POETRY_HOME/bin/poetry" run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" igniter
+  "$POETRY_HOME/bin/poetry" run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" openpype vendor, openpype\vendor
 
   echo -e "${BIGreen}>>>${RST} Building html ..."
-  poetry run python3 "$openpype_root/setup.py" build_sphinx
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/setup.py" build_sphinx
 }
 
 main
diff --git a/tools/run_projectmanager.sh b/tools/run_projectmanager.sh
index 312f321d67..b5c858c34a 100755
--- a/tools/run_projectmanager.sh
+++ b/tools/run_projectmanager.sh
@@ -79,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -97,7 +95,7 @@ main () {
   fi
 
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
-  poetry run python "$openpype_root/start.py" projectmanager
+  "$POETRY_HOME/bin/poetry" run python "$openpype_root/start.py" projectmanager
 }
 
 main
diff --git a/tools/run_settings.sh b/tools/run_settings.sh
index 0287043bb6..5a465dce2c 100755
--- a/tools/run_settings.sh
+++ b/tools/run_settings.sh
@@ -79,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -97,7 +95,7 @@ main () {
   fi
 
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
-  poetry run python3 "$openpype_root/start.py" settings --dev
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/start.py" settings --dev
 }
 
 main
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index 90977edc83..8f8f82fd9c 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -98,11 +98,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -118,7 +116,7 @@ main () {
   echo -e "${BIGreen}>>>${RST} Testing OpenPype ..."
   original_pythonpath=$PYTHONPATH
   export PYTHONPATH="$openpype_root:$PYTHONPATH"
-  poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$openpype_root/tests"
+  "$POETRY_HOME/bin/poetry" run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$openpype_root/tests"
   PYTHONPATH=$original_pythonpath
 }
 
diff --git a/tools/run_tray.sh b/tools/run_tray.sh
index 339ff6f918..2eb9886063 100755
--- a/tools/run_tray.sh
+++ b/tools/run_tray.sh
@@ -56,11 +56,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-   # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -74,7 +72,7 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running OpenPype Tray with debug option ..."
-  poetry run python3 "$openpype_root/start.py" tray --debug
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/start.py" tray --debug
 }
 
 main
\ No newline at end of file