Merge "[COMMON] Use deployment for postgresql"