diff --git a/bucket/vmware-workstation-player-np.json b/bucket/vmware-workstation-player-np.json
deleted file mode 100644
index 1c91824f1..000000000
--- a/bucket/vmware-workstation-player-np.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "version": "17.5.0-22583795",
-    "homepage": "https://www.vmware.com/ca/products/workstation-player.html",
-    "description": "An application for creating and running virtual machines on your computer.",
-    "license": {
-        "identifier": "Freeware",
-        "url": "https://www.vmware.com/ca/help/legal.html"
-    },
-    "architecture": {
-        "64bit": {
-            "url": "https://download3.vmware.com/software/WKST-PLAYER-1750/VMware-player-full-17.5.0-22583795.exe#/setup.exe",
-            "hash": "cb45b416d0b85e0d34aa2cabcfdecc8dfd82437dba91c221fbb4bce388b54717"
-        }
-    },
-    "pre_install": [
-        "if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
-        "Start-Process \"$dir\\setup.exe\" -Wait -Verb 'RunAs' -ArgumentList '/x'; Remove-Item \"$dir\\setup.exe\"",
-        "$msiInstaller = (Get-ChildItem \"$env:TEMP\" -Filter 'VMware*' -Recurse -Force).FullName; Copy-Item $msiInstaller \"$dir\\setup.msi\" -Force",
-        "Start-Process 'msiexec' -Wait -Verb 'RunAs' -ArgumentList @('/i', \"$dir\\setup.msi\", '/qn', '/norestart', 'REBOOT=ReallySuppress', 'EULAS_AGREED=1', 'ADDLOCAL=ALL')",
-        "Remove-Item $msiInstaller -Force"
-    ],
-    "pre_uninstall": [
-        "if ($cmd -eq 'uninstall') {",
-        "   if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
-        "   Start-Process 'msiexec' -Wait -Verb 'RunAs' -ArgumentList @('/x', \"$dir\\setup.msi\", '/qn', '/norestart', 'REBOOT=ReallySuppress')",
-        "   Start-Sleep -Seconds 2",
-        "   Write-Host \"Please restart your computer to uninstall $app properly\" -F 'Red'",
-        "}"
-    ],
-    "checkver": {
-        "url": "https://scoop.sh/",
-        "script": [
-            "$userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36'",
-            "(Invoke-WebRequest 'https://www.vmware.com/go/getplayer-win' -UserAgent $userAgent).BaseResponse.RequestMessage.RequestUri.AbsoluteUri"
-        ],
-        "regex": "WKST-PLAYER-(?<Half>[\\d]+)/VMware-player-full-([\\w.-]+)\\.exe"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download3.vmware.com/software/WKST-PLAYER-$matchHalf/VMware-player-full-$version.exe#/setup.exe",
-                "hash": {
-                    "type": "sha256",
-                    "url": "https://customerconnect.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=WKST-PLAYER-$matchHalf",
-                    "mode": "json",
-                    "jsonpath": "$.downloadFiles[0].sha256checksum",
-                    "find": "$sha256"
-                }
-            }
-        }
-    }
-}
diff --git a/bucket/vmware-workstation-pro-np.json b/bucket/vmware-workstation-pro-np.json
new file mode 100644
index 000000000..aed46462e
--- /dev/null
+++ b/bucket/vmware-workstation-pro-np.json
@@ -0,0 +1,70 @@
+{
+    "version": "17.5.2-23775571",
+    "homepage": "https://www.vmware.com/products/desktop-hypervisor.html",
+    "description": "An application for creating and running virtual machines on your computer.",
+    "license": {
+        "identifier": "Proprietary",
+        "url": "https://www.broadcom.com/company/legal/terms-of-use"
+    },
+    "suggest": {
+        "vcredist": "extras/vcredist"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/17.5.2/23775571/windows/core/VMware-workstation-17.5.2-23775571.exe.tar",
+            "hash": "907b4d60b94d64e9b44acb97cc279fde51f91be58833ced17993b9c6c0129a54"
+        }
+    },
+    "pre_install": [
+        "if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
+        "Start-Process -Wait ($exe = \"$dir/VMware-workstation-$version.exe\") /x",
+        "$temp = $env:TEMP+'/'+(Select-Xml /component/installerList/installer/productCode \"$dir/descriptor.xml\").Node.'#text'+'~setup'",
+        "Move-Item \"$temp/VMwareWorkstation.msi\" \"$dir\"",
+        "Remove-Item -Recurse $temp,$exe",
+        "Start-Process -Wait \"$dir/VMwareWorkstation.msi\" \"/qn /norestart ADDLOCAL=ALL ADDVKDTOPATH=0 AUTOSOFTWAREUPDATE=0 DATACOLLECTION=0 DESKTOP_SHORTCUT=0 EULAS_AGREED=1 INSTALLDIR=\"\"$dir\"\" STARTMENU_SHORTCUT=0\""
+    ],
+    "pre_uninstall": [
+        "if (!(is_admin)) { error \"$app requires admin rights to $cmd\"; break }",
+        "Set-Service VMAuthdService -StartupType Disabled",
+        "Stop-Service VMAuthdService",
+        "Get-Process vmware-tray -ErrorAction Ignore | Stop-Process",
+        "Start-Process -Wait \"$dir/VMwareWorkstation.msi\" '/qn /norestart'"
+    ],
+    "bin": [
+        "vmware.exe",
+        "bin/vctl.exe",
+        "bin/docker-machine-driver-vmware.exe",
+        "x64/vmware-vmx.exe",
+        "x64/vmware-vmx-debug.exe",
+        "x64/vmware-vmx-stats.exe",
+        "x64/mksSandbox.exe",
+        "x64/mksSandbox-debug.exe",
+        "x64/mksSandbox-stats.exe",
+        "x64/tpm2emu.exe"
+    ],
+    "shortcuts": [
+        [
+            "vmware.exe",
+            "VMware Workstation Pro"
+        ]
+    ],
+    "checkver": {
+        "url": "https://scoop.sh",
+        "script": [
+            "try {",
+            "    ([string]$version = ([Version[]](($_ = (Invoke-RestMethod https://softwareupdate.vmware.com/cds/vmw-desktop/ws/).html.body.ul.li.a.'#text')[1..$_.Length]) | Sort-Object)[-1]),",
+            "    ([UInt32[]](($_ = (Invoke-RestMethod https://softwareupdate.vmware.com/cds/vmw-desktop/ws/$version).html.body.ul.li.a.'#text')[1..$_.Length]) | Sort-Object)[-1] -join ' '",
+            "}",
+            "catch { '' }"
+        ],
+        "regex": "\\A([\\d.]+) (\\d+)\\Z",
+        "replace": "${1}-${2}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/$match1/$match2/windows/core/VMware-workstation-$version.exe.tar"
+            }
+        }
+    }
+}