Added fix to ensure we are connecting to the correct db

Reviewer: Tiff Go

Issue: GCP-9842