Hardhat-upgrades attempts to verify non-beacon contract as beacon

A similar question was asked in Unverified ERC1967 Proxy goerli

This is the environment I was using:

:computer: Environment

Solidity: 0.8.17

NPM Package versions:

"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-etherscan": "^3.1.7",
"@openzeppelin/contracts": "^4.8.2",
"@openzeppelin/contracts-upgradeable": "^4.8.2",
"@openzeppelin/hardhat-upgrades": "^1.21.0"