More comprehensive fix for changes in postgres and mysql services label