diff --git a/eoptasks/eoptasks.py b/eoptasks/eoptasks.py
index f1d1927..7aab5a3 100755
--- a/eoptasks/eoptasks.py
+++ b/eoptasks/eoptasks.py
@@ -69,6 +69,11 @@ class Server:
             for j in range(i, len(parts)):
                 if i != j:
                     self.keywords.add('.'.join(parts[i:j+1]))
+                if i == 0:
+                    # add first component without trailing digits, this allows
+                    # matching db1.prod.saas.entrouvert.org with the db
+                    # keyword.
+                    self.keywords.add(re.sub(r'\d+$', '', parts[0]))
 
     def __repr__(self):
         return '<Server %s %r>' % (self.name, self.keywords)