Remove redundant repository configuration
expand variables for chat message as well, compatible error handling