diff --git a/bucket/windows-application-driver.json b/bucket/windows-application-driver.json
index 4e81021494..99f4f31b01 100644
--- a/bucket/windows-application-driver.json
+++ b/bucket/windows-application-driver.json
@@ -3,9 +3,17 @@
     "description": "Supports Selenium-like UI Test Automation on Windows Applications.",
     "homepage": "https://github.com/Microsoft/WinAppDriver",
     "license": "MIT",
+    "notes": [
+        "Declare custom WinAppDriver.exe location for appium-windows-driver:",
+        "'$Env:APPIUM_WAD_PATH = \"$dir\\WinAppDriver.exe\"'"
+    ],
     "url": "https://github.com/Microsoft/WinAppDriver/releases/download/v1.2.1/WindowsApplicationDriver_1.2.1.msi",
     "hash": "a76a8f4e44b29bad331acf6b6c248fcc65324f502f28826ad2acd5f3c80857fe",
-    "bin": "Windows Application Driver\\WinAppDriver.exe",
+    "post_install": [
+        "Move-Item \"$dir\\System\\*\", \"$dir\\Windows Application Driver\\*\" -Destination \"$dir\"",
+        "Remove-Item \"$dir\\System\", \"$dir\\Windows Application Driver\""
+    ],
+    "bin": "WinAppDriver.exe",
     "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/Microsoft/WinAppDriver/releases/download/v$version/WindowsApplicationDriver_$version.msi"