diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
index e0ec9918..762f2542 100644
--- a/.github/workflows/build-branch.yml
+++ b/.github/workflows/build-branch.yml
@@ -52,7 +52,7 @@ jobs:
     - name: Build with pyinstaller
       id: pyinstaller
       run: |
-        pyinstaller ou_dedetai.spec --clean
+        ./scripts/build-binary.sh
         echo "bin_name=oudedetai" >> $GITHUB_OUTPUT
 
     - name: Upload artifact
diff --git a/scripts/build-binary.sh b/scripts/build-binary.sh
index 13f1affd..9efa669d 100755
--- a/scripts/build-binary.sh
+++ b/scripts/build-binary.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+start_dir="$PWD"
 script_dir="$(dirname "$0")"
 repo_root="$(dirname "$script_dir")"
+cd "$repo_root"
 if ! which pyinstaller >/dev/null 2>&1; then
-    echo "Error: Need to install pyinstaller; e.g. 'pip3 install pyinstaller'"
-    exit 1
+    # Install build deps.
+    python3 -m pip install .[build]
 fi
-python3 -m PyInstaller --clean "${repo_root}/ou_dedetai.spec"
+pyinstaller --clean --log-level DEBUG ou_dedetai.spec
+cd "$start_dir"
\ No newline at end of file
diff --git a/scripts/run_app.py b/scripts/run_app.py
index 80d348b1..e1b8bfab 100755
--- a/scripts/run_app.py
+++ b/scripts/run_app.py
@@ -6,7 +6,7 @@
 """
 import re
 import sys
-import ou_dedetai
+import ou_dedetai.main
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(ou_dedetai.main())
+    sys.exit(ou_dedetai.main.main())