I recommend using OpenZeppelin CLI 2.8 to deploy your contract, as it supports upgradeable and non-upgradeable (regular) contracts.
Deploy upgradeable
$ npx oz deploy
✓ Compiled contracts with solc 0.5.17 (commit.d19bba13)
? Choose the kind of deployment upgradeable
? Pick a network development
? Pick a contract to deploy TokenFactory
✓ Added contract TokenFactory
✓ Contract TokenFactory deployed
All implementations have been deployed
? Call a function to initialize the instance after creating it? No
✓ Setting everything up to create contract instances
✓ Instance created at 0xCfEB869F69431e42cdB54A4F4f105C19C080A601
To upgrade this instance run 'oz upgrade'
0xCfEB869F69431e42cdB54A4F4f105C19C080A601
Deploy regular
$ npx oz deploy
✓ Compiled contracts with solc 0.5.17 (commit.d19bba13)
? Choose the kind of deployment regular
? Pick a network development
? Pick a contract to deploy TokenFactory
✓ Deployed instance of TokenFactory
0x254dffcd3277C0b1660F6d42EFbB754edaBAbC2B