Support both API versions

Temp fix to handle both API versions,
while deploying the updated versions of all
necessary components.