diff --git a/.gitignore b/.gitignore
index ebb47e55d2..26bf7cf65f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,4 +91,9 @@ website/i18n/*
 
 website/debug.log
 
-website/.docusaurus
\ No newline at end of file
+website/.docusaurus
+
+# Poetry
+########
+
+.poetry/
\ No newline at end of file
diff --git a/tools/build.ps1 b/tools/build.ps1
index 5283ee4754..3a84d4dfd8 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -70,8 +70,6 @@ function Install-Poetry() {
     Write-Host ">>> " -NoNewline -ForegroundColor Green
     Write-Host "Installing Poetry ... "
     (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
-    # add it to PATH
-    $env:PATH = "$($env:PATH);$($env:USERPROFILE)\.poetry\bin"
 }
 
 $art = @"
@@ -93,6 +91,12 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
 $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
@@ -126,47 +130,20 @@ Write-Host "Making sure submodules are up-to-date ..."
 git submodule update --init --recursive
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Building OpenPype [ " -NoNewline -ForegroundColor white
+Write-Host "OpenPype [ " -NoNewline -ForegroundColor white
 Write-host $openpype_version  -NoNewline -ForegroundColor green
-Write-Host " ] ..." -ForegroundColor white
-
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Detecting host Python ... " -NoNewline
-if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-    Write-Host "!!! Python not detected" -ForegroundColor red
-    Exit-WithCode 1
-}
-$version_command = @"
-import sys
-print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))
-"@
-
-$p = & python -c $version_command
-$env:PYTHON_VERSION = $p
-$m = $p -match '(\d+)\.(\d+)'
-if(-not $m) {
-  Write-Host "!!! Cannot determine version" -ForegroundColor red
-  Exit-WithCode 1
-}
-# We are supporting python 3.6 and up
-if(($matches[1] -lt 3) -or ($matches[2] -lt 7)) {
-  Write-Host "FAILED Version [ $p ] is old and unsupported" -ForegroundColor red
-  Exit-WithCode 1
-}
-Write-Host "OK [ $p ]" -ForegroundColor green
-
+Write-Host " ]" -ForegroundColor white
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$($env:USERPROFILE)\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Install-Poetry
-    
-    Write-Host "INSTALLED" -ForegroundColor Cyan
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
 } else {
     Write-Host "OK" -ForegroundColor Green
 }
-$env:PATH = "$($env:PATH);$($env:USERPROFILE)\.poetry\bin"
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Cleaning cache files ... " -NoNewline
diff --git a/tools/build.sh b/tools/build.sh
index d0593a2b2f..846fe816c6 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -124,7 +124,6 @@ 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 -
-  export PATH="$PATH:$HOME/.poetry/bin"
 }
 
 # Main
@@ -141,6 +140,12 @@ main () {
   version_command="import os;exec(open(os.path.join('$openpype_root', 'openpype', 'version.py')).read());print(__version__);"
   openpype_version="$(python3 <<< ${version_command})"
 
+  # 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
 
@@ -149,12 +154,12 @@ main () {
   clean_pyc
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
-  if [ -f "$HOME/.poetry/bin/poetry" ]; then
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
     echo -e "${BIGreen}OK${RST}"
-    export PATH="$PATH:$HOME/.poetry/bin"
   else
     echo -e "${BIYellow}NOT FOUND${RST}"
-    install_poetry || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
   fi
 
   echo -e "${BIGreen}>>>${RST} Making sure submodules are up-to-date ..."
diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index e72e98e04b..215250b3cf 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -43,9 +43,10 @@ function Show-PSWarning() {
 function Install-Poetry() {
     Write-Host ">>> " -NoNewline -ForegroundColor Green
     Write-Host "Installing Poetry ... "
+    $env:POETRY_HOME="$openpype_root\.poetry"
     (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
     # add it to PATH
-    $env:PATH = "$($env:PATH);$($env:USERPROFILE)\.poetry\bin"
+    $env:PATH = "$($env:PATH);$openpype_root\.poetry\bin"
 }
 
 
@@ -84,6 +85,12 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
 $art = @"
@@ -118,7 +125,7 @@ Test-Python
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$($env:USERPROFILE)\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Install-Poetry
     Write-Host "INSTALLED" -ForegroundColor Cyan
diff --git a/tools/create_env.sh b/tools/create_env.sh
index 04414ddea5..203d1228e4 100755
--- a/tools/create_env.sh
+++ b/tools/create_env.sh
@@ -143,12 +143,18 @@ 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
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
-  if [ -f "$HOME/.poetry/bin/poetry" ]; then
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
     echo -e "${BIGreen}OK${RST}"
-    export PATH="$PATH:$HOME/.poetry/bin"
   else
     echo -e "${BIYellow}NOT FOUND${RST}"
     install_poetry || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
diff --git a/tools/create_zip.ps1 b/tools/create_zip.ps1
index d18806c40b..2f97a29613 100644
--- a/tools/create_zip.ps1
+++ b/tools/create_zip.ps1
@@ -37,6 +37,13 @@ function Show-PSWarning() {
 $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
 $art = @"
@@ -63,30 +70,16 @@ if (-not $openpype_version) {
   Exit-WithCode 1
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Detecting host Python ... " -NoNewline
-if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-    Write-Host "!!! Python not detected" -ForegroundColor red
-    Exit-WithCode 1
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
 }
-$version_command = @'
-import sys
-print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))
-'@
-
-$p = & python -c $version_command
-$env:PYTHON_VERSION = $p
-$m = $p -match '(\d+)\.(\d+)'
-if(-not $m) {
-  Write-Host "!!! Cannot determine version" -ForegroundColor red
-  Exit-WithCode 1
-}
-# We are supporting python 3.6 and up
-if(($matches[1] -lt 3) -or ($matches[2] -lt 7)) {
-  Write-Host "FAILED Version [ $p ] is old and unsupported" -ForegroundColor red
-  Exit-WithCode 1
-}
-Write-Host "OK [ $p ]" -ForegroundColor green
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Generating zip from current sources ..."
diff --git a/tools/create_zip.sh b/tools/create_zip.sh
index 6e7f792f1d..07d96c92da 100755
--- a/tools/create_zip.sh
+++ b/tools/create_zip.sh
@@ -120,8 +120,24 @@ 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
 
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
   poetry run python3 "$openpype_root/start.py" generate-zip "$@"
 }
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index d1b914fac2..46d9e9b063 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -14,7 +14,26 @@ PS> .\fetch_thirdparty_libs.ps1
 $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
+
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
 & poetry run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
 Set-Location -Path $current_dir
diff --git a/tools/fetch_thirdparty_libs.sh b/tools/fetch_thirdparty_libs.sh
index e305b4b3e4..1a16ffe5b7 100755
--- a/tools/fetch_thirdparty_libs.sh
+++ b/tools/fetch_thirdparty_libs.sh
@@ -116,14 +116,29 @@ main () {
   echo -e "${BGreen}"
   art
   echo -e "${RST}"
-  detect_python || return 1
 
   # Directories
-  pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))
-  pushd "$pype_root" > /dev/null || return > /dev/null
+  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"
+
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
+  pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running Pype tool ..."
-  poetry run python3 "$pype_root/tools/fetch_thirdparty_libs.py"
+  poetry run python3 "$openpype_root/tools/fetch_thirdparty_libs.py"
 }
 
 main
\ No newline at end of file
diff --git a/tools/make_docs.ps1 b/tools/make_docs.ps1
index aa526bbdc9..cf76b3dcf1 100644
--- a/tools/make_docs.ps1
+++ b/tools/make_docs.ps1
@@ -16,6 +16,13 @@ PS> .\make_docs.ps1
 $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
 
@@ -32,6 +39,17 @@ $art = @"
 
 Write-Host $art -ForegroundColor DarkGreen
 
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
 Write-Host "This will not overwrite existing source rst files, only scan and add new."
 Set-Location -Path $openpype_root
 Write-Host ">>> " -NoNewline -ForegroundColor green
diff --git a/tools/make_docs.sh b/tools/make_docs.sh
index 2ac12d3d95..595c3e761b 100755
--- a/tools/make_docs.sh
+++ b/tools/make_docs.sh
@@ -71,6 +71,22 @@ 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"
+
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running apidoc ..."
diff --git a/tools/run_settings.ps1 b/tools/run_settings.ps1
index 3f99de4b4e..5d379f7f72 100644
--- a/tools/run_settings.ps1
+++ b/tools/run_settings.ps1
@@ -14,6 +14,25 @@ PS> .\run_settings.ps1
 $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
+
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
 & poetry run python "$($openpype_root)\start.py" settings --dev
 Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/run_settings.sh b/tools/run_settings.sh
index 0c8a951d7c..46edad9dcb 100755
--- a/tools/run_settings.sh
+++ b/tools/run_settings.sh
@@ -50,35 +50,6 @@ BICyan='\033[1;96m'       # Cyan
 BIWhite='\033[1;97m'      # White
 
 
-##############################################################################
-# Detect required version of python
-# Globals:
-#   colors
-#   PYTHON
-# Arguments:
-#   None
-# Returns:
-#   None
-###############################################################################
-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})"
-  oIFS="$IFS"
-  IFS=.
-  set -- $python_version
-  IFS="$oIFS"
-  if [ "$1" -ge "3" ] && [ "$2" -ge "6" ] ; then
-    if [ "$2" -gt "7" ] ; then
-      echo -e "${BIWhite}[${RST} ${BIRed}$1.$2 ${BIWhite}]${RST} - ${BIRed}FAILED${RST} ${BIYellow}Version is new and unsupported, use${RST} ${BIPurple}3.7.x${RST}"; return 1;
-    else
-      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; }
-  fi
-}
-
 ##############################################################################
 # Clean pyc files in specified directory
 # Globals:
@@ -90,7 +61,7 @@ detect_python () {
 ###############################################################################
 clean_pyc () {
   local path
-  path=$oepnpype_root
+  path=$openpype_root
   echo -e "${BIGreen}>>>${RST} Cleaning pyc at [ ${BIWhite}$path${RST} ] ... \c"
   find "$path" -regex '^.*\(__pycache__\|\.py[co]\)$' -delete
   echo -e "${BIGreen}DONE${RST}"
@@ -114,12 +85,27 @@ main () {
   echo -e "${BGreen}"
   art
   echo -e "${RST}"
-  detect_python || return 1
 
   # 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
 
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
   poetry run python3 "$openpype_root/start.py" settings --dev
 }
diff --git a/tools/run_tests.ps1 b/tools/run_tests.ps1
index 5070591c02..4ecbb4c29d 100644
--- a/tools/run_tests.ps1
+++ b/tools/run_tests.ps1
@@ -49,6 +49,12 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
 $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
@@ -61,34 +67,20 @@ if (-not $openpype_version) {
 }
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Building OpenPype [ " -NoNewline -ForegroundColor white
+Write-Host "OpenPype [ " -NoNewline -ForegroundColor white
 Write-host $openpype_version  -NoNewline -ForegroundColor green
 Write-Host " ] ..." -ForegroundColor white
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Detecting host Python ... " -NoNewline
-if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-    Write-Host "!!! Python not detected" -ForegroundColor red
-    Exit-WithCode 1
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
 }
-$version_command = @"
-import sys
-print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))
-"@
-
-$p = & python -c $version_command
-$env:PYTHON_VERSION = $p
-$m = $p -match '(\d+)\.(\d+)'
-if(-not $m) {
-  Write-Host "!!! Cannot determine version" -ForegroundColor red
-  Exit-WithCode 1
-}
-# We are supporting python 3.6 and up
-if(($matches[1] -lt 3) -or ($matches[2] -lt 7)) {
-  Write-Host "FAILED Version [ $p ] is old and unsupported" -ForegroundColor red
-  Exit-WithCode 1
-}
-Write-Host "OK [ $p ]" -ForegroundColor green
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Cleaning cache files ... " -NoNewline
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index 0af052ca01..7184dde8e7 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -49,32 +49,6 @@ BIPurple='\033[1;95m'     # Purple
 BICyan='\033[1;96m'       # Cyan
 BIWhite='\033[1;97m'      # White
 
-
-##############################################################################
-# Detect required version of python
-# Globals:
-#   colors
-#   PYTHON
-# Arguments:
-#   None
-# Returns:
-#   None
-###############################################################################
-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})"
-  oIFS="$IFS"
-  IFS=.
-  set -- $python_version
-  IFS="$oIFS"
-  if [ "$1" -ge "3" ] && [ "$2" -ge "6" ] ; then
-    echo -e "${BIWhite}[${RST} ${BIGreen}$1.$2${RST} ${BIWhite}]${RST}"
-  else
-    command -v python3 >/dev/null 2>&1 || { echo -e "${BIRed}FAILED${RST} ${BIYellow} Version [${RST}${BICyan}$1.$2${RST}]${BIYellow} is old and unsupported${RST}"; return 1; }
-  fi
-}
-
 ##############################################################################
 # Clean pyc files in specified directory
 # Globals:
@@ -110,10 +84,25 @@ main () {
   echo -e "${BGreen}"
   art
   echo -e "${RST}"
-  detect_python || return 1
 
   # 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"
+
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
   pushd "$openpype_root" || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Testing OpenPype ..."
diff --git a/tools/run_tray.ps1 b/tools/run_tray.ps1
index 9485584c6f..1a24879234 100644
--- a/tools/run_tray.ps1
+++ b/tools/run_tray.ps1
@@ -13,7 +13,25 @@ PS> .\run_tray.ps1
 $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 Set-Location -Path $openpype_root
 
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
 & poetry run python "$($openpype_root)\start.py" tray --debug
 Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/run_tray.sh b/tools/run_tray.sh
index 8174f7e38a..d6fa755e3b 100755
--- a/tools/run_tray.sh
+++ b/tools/run_tray.sh
@@ -49,37 +49,6 @@ BIPurple='\033[1;95m'     # Purple
 BICyan='\033[1;96m'       # Cyan
 BIWhite='\033[1;97m'      # White
 
-
-##############################################################################
-# Detect required version of python
-# Globals:
-#   colors
-#   PYTHON
-# Arguments:
-#   None
-# Returns:
-#   None
-###############################################################################
-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})"
-  oIFS="$IFS"
-  IFS=.
-  set -- $python_version
-  IFS="$oIFS"
-  if [ "$1" -ge "3" ] && [ "$2" -ge "6" ] ; then
-    if [ "$2" -gt "7" ] ; then
-      echo -e "${BIWhite}[${RST} ${BIRed}$1.$2 ${BIWhite}]${RST} - ${BIRed}FAILED${RST} ${BIYellow}Version is new and unsupported, use${RST} ${BIPurple}3.7.x${RST}"; return 1;
-    else
-      echo -e "${BIWhite}[${RST} ${BIGreen}$1.$2${RST} ${BIWhite}]${RST}"
-    fi
-    PYTHON="python3"
-  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; }
-  fi
-}
-
 ##############################################################################
 # Clean pyc files in specified directory
 # Globals:
@@ -119,6 +88,22 @@ 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"
+
+  echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
+  if [ -f "$POETRY_HOME/bin/poetry" ]; then
+    echo -e "${BIGreen}OK${RST}"
+  else
+    echo -e "${BIYellow}NOT FOUND${RST}"
+    echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..."
+    . "$openpype_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
+  fi
+
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running OpenPype Tray with debug option ..."