Merge "New JJB file for postgres container"