Bypass Cloudify tenancy issues