diff --git a/circleci-cli.json b/circleci-cli.json
index 18b96c5..341d9fd 100644
--- a/circleci-cli.json
+++ b/circleci-cli.json
@@ -3,10 +3,12 @@
         "github": "https://github.com/CircleCI-Public/circleci-cli/"
     },
     "autoupdate": {
-        "url": "https://github.com/CircleCI-Public/circleci-cli/releases/download/v$version/circleci-cli_$version_windows_amd64.zip"
+        "url": "https://github.com/CircleCI-Public/circleci-cli/releases/download/v$version/circleci-cli_$version_windows_amd64.zip",
+        "extract_dir": "circleci-cli_$version_windows_amd64"
     },
     "version": "0.1.5879",
+    "extract_dir": "circleci-cli_0.1.5879_windows_amd64",
     "url": "https://github.com/CircleCI-Public/circleci-cli/releases/download/v0.1.5879/circleci-cli_0.1.5879_windows_amd64.zip",
-    "bin": "circleci-cli_0.1.5652_windows_amd64/circleci.exe",
+    "bin": "circleci.exe",
     "hash": "ca7fef41ca01cad6efef5adef0283bc314872ce82ab815c562c610d16e239af0"
 }
diff --git a/streamlink-twitch-gui.json b/streamlink-twitch-gui.json
index 17077ac..bfbd03b 100644
--- a/streamlink-twitch-gui.json
+++ b/streamlink-twitch-gui.json
@@ -6,11 +6,12 @@
     },
     "version": "1.9.0",
     "url": "https://github.com/streamlink/streamlink-twitch-gui/releases/download/v1.9.0/streamlink-twitch-gui-v1.9.0-win64.zip",
-    "bin": "streamlink-twitch-gui/streamlink-twitch-gui.exe",
+    "bin": "streamlink-twitch-gui.exe",
     "hash": "9945397c2ca5e5fbc5a2a5308ab7b6f440564ae3405a0750d193b0bfcf402c77",
+    "extract_dir": "streamlink-twitch-gui",
     "shortcuts": [
         [
-            "streamlink-twitch-gui/streamlink-twitch-gui.exe",
+            "streamlink-twitch-gui.exe",
             "StreamLink Twitch GUI"
         ]
     ]