diff --git a/plinth/modules/bind/__init__.py b/plinth/modules/bind/__init__.py
index d1000cbf7..f7ee5ead3 100644
--- a/plinth/modules/bind/__init__.py
+++ b/plinth/modules/bind/__init__.py
@@ -39,7 +39,8 @@ class BindApp(app_module.App):
         info = app_module.Info(app_id=self.app_id, version=self._version,
                                name=_('BIND'), icon='fa-globe-w',
                                short_description=_('Domain Name Server'),
-                               description=_description, manual_page='Bind')
+                               description=_description, manual_page='Bind',
+                               tags=manifest.tags)
         self.add(info)
 
         menu_item = menu.Menu('menu-bind', info.name, info.short_description,
diff --git a/plinth/modules/bind/manifest.py b/plinth/modules/bind/manifest.py
index b8f345890..4a70705ef 100644
--- a/plinth/modules/bind/manifest.py
+++ b/plinth/modules/bind/manifest.py
@@ -3,9 +3,16 @@
 Application manifest for bind.
 """
 
+from django.utils.translation import gettext_lazy as _
+
 backup = {
     'config': {
         'files': ['/etc/bind/named.conf.options']
     },
     'services': ['named']
 }
+
+tags = [
+    _('Name server'),
+    _('DNS resolver'),
+]
diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py
index 571d17419..7b73b04a6 100644
--- a/plinth/modules/cockpit/__init__.py
+++ b/plinth/modules/cockpit/__init__.py
@@ -54,7 +54,7 @@ class CockpitApp(app_module.App):
                                icon_filename='cockpit',
                                short_description=_('Server Administration'),
                                description=_description, manual_page='Cockpit',
-                               clients=manifest.clients)
+                               clients=manifest.clients, tags=manifest.tags)
         self.add(info)
 
         menu_item = menu.Menu('menu-cockpit', info.name,
diff --git a/plinth/modules/cockpit/manifest.py b/plinth/modules/cockpit/manifest.py
index 427a0167f..62ad8cb66 100644
--- a/plinth/modules/cockpit/manifest.py
+++ b/plinth/modules/cockpit/manifest.py
@@ -18,3 +18,10 @@ clients = [{
 # will set the value of allowed domains correctly. This is the only key the is
 # customized in cockpit.conf.
 backup: dict = {}
+
+tags = [
+    _('Server manager'),
+    _('Terminal'),
+    _('Disks'),
+    _('RAID'),
+]
diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py
index 3f32b69ab..ccbbed271 100644
--- a/plinth/modules/letsencrypt/__init__.py
+++ b/plinth/modules/letsencrypt/__init__.py
@@ -60,7 +60,7 @@ class LetsEncryptApp(app_module.App):
                                name=_('Let\'s Encrypt'), icon='fa-lock',
                                short_description=_('Certificates'),
                                description=_description,
-                               manual_page='LetsEncrypt',
+                               manual_page='LetsEncrypt', tags=manifest.tags,
                                donation_url='https://letsencrypt.org/donate/')
         self.add(info)
 
diff --git a/plinth/modules/letsencrypt/manifest.py b/plinth/modules/letsencrypt/manifest.py
index 4055b1717..d0c35d68f 100644
--- a/plinth/modules/letsencrypt/manifest.py
+++ b/plinth/modules/letsencrypt/manifest.py
@@ -3,5 +3,9 @@
 Application manfiest for letsencrypt.
 """
 
+from django.utils.translation import gettext_lazy as _
+
 # XXX: Backup and restore the Apache site configuration.
 backup = {'secrets': {'directories': ['/etc/letsencrypt/']}}
+
+tags = [_('Certificates'), _('HTTPS'), _('Web security'), _('Encryption')]
diff --git a/plinth/modules/pagekite/__init__.py b/plinth/modules/pagekite/__init__.py
index 033fd8a73..4bf536282 100644
--- a/plinth/modules/pagekite/__init__.py
+++ b/plinth/modules/pagekite/__init__.py
@@ -58,7 +58,7 @@ class PagekiteApp(app_module.App):
             app_id=self.app_id, version=self._version, depends=['names'],
             name=_('PageKite'), icon='fa-flag',
             short_description=_('Public Visibility'), description=_description,
-            manual_page='PageKite',
+            manual_page='PageKite', tags=manifest.tags,
             donation_url='https://pagekite.net/support/faq/#donate')
         self.add(info)
 
diff --git a/plinth/modules/pagekite/manifest.py b/plinth/modules/pagekite/manifest.py
index 448d62fd5..00177202c 100644
--- a/plinth/modules/pagekite/manifest.py
+++ b/plinth/modules/pagekite/manifest.py
@@ -3,9 +3,13 @@
 Application manifest for pagekite.
 """
 
+from django.utils.translation import gettext_lazy as _
+
 backup = {
     'config': {
         'directories': ['/etc/pagekite.d/']
     },
     'services': ['pagekite']
 }
+
+tags = [_('Tunneling'), _('NAT traversal'), _('Remote access')]
diff --git a/plinth/modules/performance/__init__.py b/plinth/modules/performance/__init__.py
index 59d1498f5..c3bf2cb4b 100644
--- a/plinth/modules/performance/__init__.py
+++ b/plinth/modules/performance/__init__.py
@@ -41,7 +41,7 @@ class PerformanceApp(app_module.App):
                                short_description=_('System Monitoring'),
                                description=_description,
                                manual_page='Performance',
-                               clients=manifest.clients)
+                               clients=manifest.clients, tags=manifest.tags)
         self.add(info)
 
         menu_item = menu.Menu('menu-performance', info.name,
diff --git a/plinth/modules/performance/manifest.py b/plinth/modules/performance/manifest.py
index ee153ee02..c9cdfe7c9 100644
--- a/plinth/modules/performance/manifest.py
+++ b/plinth/modules/performance/manifest.py
@@ -14,3 +14,5 @@ clients = [{
 }]
 
 backup: dict = {}
+
+tags = [_('Monitoring'), _('Resource utilization')]