EDREI-11753: Adapted the configuration according to Johans comments.