diff --git a/pkg/server/templates/usage.templ b/pkg/server/templates/usage.templ
index 82ed0c9..7b0599f 100644
--- a/pkg/server/templates/usage.templ
+++ b/pkg/server/templates/usage.templ
@@ -173,19 +173,28 @@ templ Usage(access models.ConvergeAccess) {
             hx-on::after-request="saveFormToCookieEvent(event)">
           <table class="table table-responsive">
                <tr>
-                 <td class="minimal-width"><label for="rendez-vous-id">rendez-vous id</label></td>
+                 <td class="minimal-width"><label
+                     for="rendez-vous-id"
+                     data-toggle="tooltip"
+                     title="this allows the remote agent and client to find each other">rendez-vous id</label></td>
                  <td>
                    <input id="rendez-vous-id" class="form-control" name="rendez-vous-id" type="text" maxlength="40"></input>
                  </td>
                </tr>
                <tr>
-                 <td class="minimal-width"><label for="ssh-keys">public ssh keys</label></td>
+                 <td class="minimal-width"><label
+                     for="ssh-keys"
+                     data-toggle="tooltip"
+                     title="public SSH public keys define which users are allowed to connect">public ssh keys</label></td>
                  <td>
                    <textarea id="ssh-keys" class="form-control autogrow" name="ssh-keys" rows="5"></textarea>
                  </td>
               </tr>
               <tr>
-                  <td class="minimal-width"><label for="remote-shell">agent environment</label></td>
+                  <td class="minimal-width"><label
+                      for="remote-shell"
+                      data-toggle="tooltip"
+                      title="is the agent running on linux (sh-like shell) or windows?">agent environment</label></td>
                   <td>
                       <input checked id="remote-shell-0" name="remote-shell" type="radio" value={BASH}> <label for="remote-shell-0">bash, sh, zsh, ...</label>
                       <input id="remote-shell-1" name="remote-shell" type="radio" value={CMD}> <label for="remote-shell-1">command prompt</label>
@@ -193,14 +202,20 @@ templ Usage(access models.ConvergeAccess) {
                   </td>
               </tr>
               <tr>
-                  <td class="minimal-width"><label for="download-command">download method</label></td>
+                  <td class="minimal-width"><label
+                      for="download-command"
+                      data-toggle="tooltip"
+                      title="how is the agent downloaded to the remote environment?">download method</label></td>
                   <td>
                       <input checked id="download-command-0" name="download-command" type="radio" value={CURL}> <label for="download-command-0">curl</label>
                       <input id="download-command-1" name="download-command" type="radio" value={WGET}> <label for="download-command-1">wget</label>
                   </td>
               </tr>
               <tr>
-                  <td class="minimal-width"><label for="certificate-validation">certificate validation</label></td>
+                  <td class="minimal-width"><label
+                      for="certificate-validation"
+                      data-toggle="tooltip"
+                      title="turn off certificate validation if the converge certificate is untrusted by the remote system">certificate validation</label></td>
                   <td>
                       <input checked id="certificate-validation-0" name="certificate-validation" type="checkbox" checked> <label for="certificate-validation-0"></label>
                   </td>