diff --git a/src/risotto/image.py b/src/risotto/image.py
index 3892440..fdb2ce9 100644
--- a/src/risotto/image.py
+++ b/src/risotto/image.py
@@ -230,12 +230,12 @@ def valid_mandatories(config):
             var_server_name = config.option(path_server_name).description()
             if server_name != var_server_name:
                 server_name = var_server_name
-                title = f'=== Missing variables for {server_name} ==='
+                title = f'=== Missing variables for "{server_name.split(".", 1)[0]}" ==='
             text = mandatory_option.doc()
             msg = f' - {text} ({path})'
             supplier = mandatory_option.information.get('supplier', None)
-            if supplier:
-                msg += f' you could add a service that provides "{supplier}"'
+            if supplier and not ':' in supplier:
+                msg += f' you should add a service that provides "{supplier}"'
             if mandatory_option.isfollower():
                 leader = mandatory_option.leader()
                 try: