diff --git a/groups/all.py b/groups/all.py
index 433fb6c..8242284 100644
--- a/groups/all.py
+++ b/groups/all.py
@@ -5,7 +5,6 @@ groups['all'] = {
     'bundles': {
         'apt',
         'hostname',
-        'letsencrypt',
         'sudo',
         'systemd',
         'users',
diff --git a/groups/features.py b/groups/features.py
new file mode 100644
index 0000000..4adf2b8
--- /dev/null
+++ b/groups/features.py
@@ -0,0 +1,6 @@
+groups['webserver'] = {
+    'bundles': {
+        'letsencrypt',
+        'nginx',
+    },
+}
diff --git a/nodes/htz-cloud/sewfile.py b/nodes/htz-cloud/sewfile.py
index 9826d4a..e51835a 100644
--- a/nodes/htz-cloud/sewfile.py
+++ b/nodes/htz-cloud/sewfile.py
@@ -3,9 +3,11 @@
 
 nodes['htz-cloud.sewfile'] = {
     'bundles': [
-        'nginx',
         'seafile',
     ],
+    'groups': {
+        'webserver',
+    },
     'metadata': {
         'letsencrypt': {
             'domains': {
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 7330dfa..23b88b4 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -3,13 +3,15 @@ nodes['htz.ex42-1048908'] = {
         'jenkins-ci',
         'matrix-synapse',
         'mx-puppet-discord',
-        'nginx',
         'nodejs',
         'riot-web',
         'postgresql',
         'vmhost',
         'voc-loudness-monitor',
     ],
+    'groups': {
+        'webserver',
+    },
     'metadata': {
         'apt': {
             'packages': {