diff --git a/bundles/ssh/items.py b/bundles/ssh/items.py
index 265fc69..554c296 100644
--- a/bundles/ssh/items.py
+++ b/bundles/ssh/items.py
@@ -1,14 +1,14 @@
-if not node.in_group('raspberry-pi'):
-    # FIXME
+if not node.metadata.get('FIXME_dont_touch_sshd', False):
+    # on debian bullseye raspberry images, starting the systemd ssh
+    # daemon seems to collide with an existing sysv daemon
     files['/etc/ssh/sshd_config'] = {
         'triggers': [
             'svc_systemd:ssh:restart'
         ],
     }
 
-svc_systemd['ssh'] = {
-    'running': not node.in_group('raspberry-pi'), # FIXME
-    'needs': [
-        'tag:ssh_users',
-    ],
-}
+    svc_systemd['ssh'] = {
+        'needs': [
+            'tag:ssh_users',
+        ],
+    }
diff --git a/nodes/home.openhab3.py b/nodes/home.openhab3.py
index 1b83fc8..82b1644 100644
--- a/nodes/home.openhab3.py
+++ b/nodes/home.openhab3.py
@@ -11,6 +11,8 @@
         'java',
     ],
     'metadata': {
+        'FIXME_dont_touch_sshd': True,
+        
         'id': '0afcde75-95c8-4fbd-b4c2-8a0fcc92884a',
         'network': {
             'internal': {
diff --git a/nodes/home.stromzaehler.py b/nodes/home.stromzaehler.py
index 740648b..9012af7 100644
--- a/nodes/home.stromzaehler.py
+++ b/nodes/home.stromzaehler.py
@@ -10,6 +10,7 @@
        'wpa-supplicant',
     ],
     'metadata': {
+        'FIXME_dont_touch_sshd': True,
         'id': 'dd521b8a-dc03-43f5-b29f-068f948ba3b8',
         'network': {
             'internal': {