diff --git a/tools/build.ps1 b/tools/build.ps1
index 412bb111c1..5283ee4754 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -121,6 +121,10 @@ catch {
     Exit-WithCode 1
 }
 
+Write-Host ">>> " -NoNewLine -ForegroundColor green
+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_version  -NoNewline -ForegroundColor green
diff --git a/tools/build.sh b/tools/build.sh
index fc9d6b054a..9766e0f53c 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -157,6 +157,9 @@ main () {
     install_poetry || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; }
   fi
 
+  echo -e "${BIGreen}>>>${RST} Making sure submodules are up-to-date ..."
+  git submodule update --init --recursive
+
   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; }
@@ -165,17 +168,18 @@ main () {
   fi
   poetry run python3 "$openpype_root/tools/build_dependencies.py"
 
-
-if command -v create-dmg > /dev/null 2>&1; then
-    create-dmg \
-      --volname "OpenPype Installer" \
-      --window-pos 200 120 \
-      --window-size 600 300 \
-      --app-drop-link 100 50 \
-      "$openpype_root/build/OpenPype-Installer.dmg" \
-      "$openpype_root/build/OpenPype.app"
-  else
-    echo create-dmg command is not availableg
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    if command -v create-dmg > /dev/null 2>&1; then
+      create-dmg \
+        --volname "OpenPype Installer" \
+        --window-pos 200 120 \
+        --window-size 600 300 \
+        --app-drop-link 100 50 \
+        "$openpype_root/build/OpenPype-Installer.dmg" \
+        "$openpype_root/build/OpenPype.app"
+    else
+      echo -e "${BIYellow}!!!${RST} ${BIWhite}create-dmg${RST} command is not available."
+    fi
   fi
 
   echo -e "${BICyan}>>>${RST} All done. You will find OpenPype and build log in \c"
diff --git a/tools/run_mongo.sh b/tools/run_mongo.sh
index 1c788abcaf..8c94fcf881 100755
--- a/tools/run_mongo.sh
+++ b/tools/run_mongo.sh
@@ -82,3 +82,4 @@ main () {
   echo -e "${BIGreen}>>>${RST} Detached to background."
 }
 
+main