diff --git a/scripts/heroku/postbuild.sh b/scripts/heroku/postbuild.sh
index cd59f620..b6e68c4e 100755
--- a/scripts/heroku/postbuild.sh
+++ b/scripts/heroku/postbuild.sh
@@ -1,17 +1,11 @@
 
-cd ui/
-
 echo "Build and Export UI"
-yarn export
-
-cd ../api
+yarn --cwd ui export
 
 echo "Copy Exported UI to API"
-cp -r ui/out public
-
-yarn install
+cp -r ui/out/ api/public/
 
 echo "Build API"
-yarn build
+yarn --cwd api build
 
 echo "FINISHED postbuild"
diff --git a/scripts/heroku/prebuild.sh b/scripts/heroku/prebuild.sh
index b580a8b1..7f991920 100755
--- a/scripts/heroku/prebuild.sh
+++ b/scripts/heroku/prebuild.sh
@@ -1,12 +1,8 @@
 
-cd ui/
-
 echo "Install UI"
-yarn install --frozen-lockfile
-
-cd ../api
+yarn --cwd ui install --frozen-lockfile
 
 echo "Install API"
-yarn install --frozen-lockfile
+yarn --cwd api install --frozen-lockfile
 
 echo "FINISHED prebuild"