diff --git a/dist/index.js b/dist/index.js
index 12fd7a37..ff179ba8 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -13014,9 +13014,9 @@ function getNode(versionSpec, stable, token) {
             let extPath;
             if (osPlat == 'win32') {
                 let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-                // 7z extracts to filename folder
-                const srcPath = path.join(downloadPath, `node-v${info.resolvedVersion}-win-${osArch}`);
-                extPath = yield tc.extract7z(srcPath, undefined, _7zPath);
+                extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
+                // 7z extracts to folder matching file name
+                extPath = path.join(extPath, path.basename(downloadPath));
             }
             else {
                 extPath = yield tc.extractTar(downloadPath, undefined, [
diff --git a/src/installer.ts b/src/installer.ts
index 60435362..4f0ea3b6 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -75,12 +75,10 @@ export async function getNode(
     let extPath: string;
     if (osPlat == 'win32') {
       let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-      // 7z extracts to filename folder
-      const srcPath = path.join(
-        downloadPath,
-        `node-v${info.resolvedVersion}-win-${osArch}`
-      );
-      extPath = await tc.extract7z(srcPath, undefined, _7zPath);
+
+      extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
+      // 7z extracts to folder matching file name
+      extPath = path.join(extPath, path.basename(downloadPath));
     } else {
       extPath = await tc.extractTar(downloadPath, undefined, [
         'xz',