diff --git a/bucket/yarn.json b/bucket/yarn.json
index d60d4ddef8..72204965dd 100644
--- a/bucket/yarn.json
+++ b/bucket/yarn.json
@@ -15,9 +15,12 @@
     "persist": [
         "cache",
         "bin",
-        "mirror"
+        "mirror",
+        "global"
     ],
     "post_install": [
+        "yarn config set global-folder \"$dir\\global\"",
+        "Set-Content $env:USERPROFILE\\.yarnrc (Get-Content $env:USERPROFILE\\.yarnrc | %{ $_ -replace \"^global-folder\", \"--global-folder\" })",
         "yarn config set cache-folder \"$dir\\cache\"",
         "yarn config set yarn-offline-mirror \"$dir\\mirror\"",
         "yarn config set prefix \"$dir\""