Cigars in Saigon (Ho Chi Minh City)

I've been trying to locate a decent cigar outlet (e.g cohiba, montecristo) in HCMC, but keep running into dead ends. I'm located in Quan 1 / Ben Thanh, through googling I have found:

Casa Habana Cigars: 41 Hai Ba Trung, Ben Nghe Ward (When I went there, it was a clothing store, was informed the cigar shop had moved, the staff didn't know where)

Skewers: 9A Thai Van Lung | Dong Khoi / Hai Ba Trung Area (Had a local ring up to check they sold cigars as it was mentioned online they have a cigar lounge, was informed they didn't sell cigars)

I've asked the staff where I am staying if they knew anywhere that sold cigars (showed them pictures), they asked each other and none did.

There's one more place I have on my list, it's Saigon Saigon Bar (Rooftop @ Caravelle Hotel | 19 Lam Son Square), it's a bit out of my way so if this one is a bust I'm out of current options.

If anyone has any knowledge of cigar outlets or sellers in Saigon, please let me know.

Thanks