diff --git a/conf.d/wato/.wato b/conf.d/wato/.wato
index 8ed2530..fdae591 100644
--- a/conf.d/wato/.wato
+++ b/conf.d/wato/.wato
@@ -1 +1 @@
-{'title': 'Main directory', 'attributes': {'network_scan': {'ip_ranges': [('ip_network', ('192.168.0.0', 24))], 'exclude_ranges': [], 'scan_interval': 86400, 'time_allowed': [((0, 0), (24, 0))], 'set_ipaddress': True, 'tag_criticality': 'offline', 'run_as': 'caelebfi'}, 'meta_data': {'created_at': 1617188804.0, 'created_by': None, 'updated_at': 1642962728.2425072}, 'network_scan_result': {'start': 1642962721.649383, 'end': 1642962728.2352762, 'state': True, 'output': 'The network scan found 2 new hosts.'}}, 'num_hosts': 39, 'lock': False, 'lock_subfolders': False, '__id': '88281816b15e48f3bb1f36dd63aa5b63'}
+{'title': 'Main directory', 'attributes': {'network_scan': {'ip_ranges': [('ip_network', ('192.168.0.0', 24))], 'exclude_ranges': [], 'scan_interval': 86400, 'time_allowed': [((0, 0), (24, 0))], 'set_ipaddress': True, 'tag_criticality': 'offline', 'run_as': 'caelebfi'}, 'meta_data': {'created_at': 1617188804.0, 'created_by': None, 'updated_at': 1643015354.9566226}, 'network_scan_result': {'start': 1642962721.649383, 'end': 1642962728.2352762, 'state': True, 'output': 'The network scan found 2 new hosts.'}}, 'num_hosts': 39, 'lock': False, 'lock_subfolders': False, '__id': '88281816b15e48f3bb1f36dd63aa5b63'}
diff --git a/conf.d/wato/contacts.mk b/conf.d/wato/contacts.mk
index 4773a0e..de80232 100644
--- a/conf.d/wato/contacts.mk
+++ b/conf.d/wato/contacts.mk
@@ -1,3 +1,38 @@
 # Written by Checkmk store
 
-contacts.update({'cmkadmin': {'contactgroups': [], 'alias': 'cmkadmin', 'disable_notifications': {}, 'pager': '', 'email': '', 'fallback_contact': False, 'force_authuser_webservice': False, 'user_scheme_serial': 0}, 'caelebfi': {'contactgroups': ['all'], 'alias': 'Gorden', 'disable_notifications': {}, 'pager': '', 'email': 'gorden.mende@solusar.de', 'fallback_contact': False, 'force_authuser_webservice': False, 'user_scheme_serial': 0, 'notification_rules': [{'description': '', 'comment': '', 'docu_url': '', 'disabled': False, 'match_folder': 'outside', 'notify_plugin': ('mail', {'from': {'address': 'cmk@solusar.de'}}), 'contact_users': ['caelebfi'], 'allow_disable': True}], 'notifications_enabled': False, 'notification_period': '24X7', 'host_notification_options': 'durfs', 'service_notification_options': 'wucrfs', 'notification_method': 'email'}, 'automation': {'alias': 'Check_MK Automation - used for calling web services', 'notifications_enabled': False, 'pager': '', 'email': '', 'contactgroups': [], 'user_scheme_serial': 0}})
+contacts.update({'automation': {'alias': 'Check_MK Automation - used for calling web services',
+                'contactgroups': [],
+                'email': '',
+                'notifications_enabled': False,
+                'pager': '',
+                'user_scheme_serial': 0},
+ 'caelebfi': {'alias': 'Gorden',
+              'contactgroups': ['all'],
+              'disable_notifications': {},
+              'email': 'gorden.mende@solusar.de',
+              'fallback_contact': False,
+              'force_authuser_webservice': False,
+              'host_notification_options': 'durfs',
+              'notification_method': 'email',
+              'notification_period': '24X7',
+              'notification_rules': [{'allow_disable': True,
+                                      'comment': '',
+                                      'contact_users': ['caelebfi'],
+                                      'description': '',
+                                      'disabled': False,
+                                      'docu_url': '',
+                                      'match_folder': 'outside',
+                                      'notify_plugin': ('mail',
+                                                        {'from': {'address': 'cmk@solusar.de'}})}],
+              'notifications_enabled': False,
+              'pager': '',
+              'service_notification_options': 'wucrfs',
+              'user_scheme_serial': 0},
+ 'cmkadmin': {'alias': 'cmkadmin',
+              'contactgroups': [],
+              'disable_notifications': {},
+              'email': '',
+              'fallback_contact': False,
+              'force_authuser_webservice': False,
+              'pager': '',
+              'user_scheme_serial': 0}})
diff --git a/conf.d/wato/hosts.mk b/conf.d/wato/hosts.mk
index 9f7d83a..f53c8c6 100644
--- a/conf.d/wato/hosts.mk
+++ b/conf.d/wato/hosts.mk
@@ -441,196 +441,196 @@ host_attributes.update(
                                                                      'meta_data': {'created_at': 1634918888.6127768,
                                                                                    'created_by': 'Network '
                                                                                                  'scan',
-                                                                                   'updated_at': 1642962728.0556083},
+                                                                                   'updated_at': 1643015354.986944},
                                                                      'tag_criticality': 'offline'},
  '192-168-0-125.fritz.box': {'ipaddress': '192.168.0.125',
                              'meta_data': {'created_at': 1642789810.5878737,
                                            'created_by': 'Network scan',
-                                           'updated_at': 1642962728.0574417},
+                                           'updated_at': 1643015354.9878},
                              'tag_criticality': 'offline'},
  '192-168-0-138.fritz.box': {'ipaddress': '192.168.0.138',
                              'meta_data': {'created_at': 1634659520.7821908,
                                            'created_by': 'Network scan',
-                                           'updated_at': 1642962728.0587146},
+                                           'updated_at': 1643015354.9885862},
                              'tag_criticality': 'offline'},
  '192.168.0.104': {'ipaddress': '192.168.0.104',
                    'meta_data': {'created_at': 1642876268.622854,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0599391},
+                                 'updated_at': 1643015354.9892707},
                    'tag_criticality': 'offline'},
  '192.168.0.105': {'ipaddress': '192.168.0.105',
                    'meta_data': {'created_at': 1634659520.7765539,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0612454},
+                                 'updated_at': 1643015354.989946},
                    'tag_criticality': 'offline'},
  '192.168.0.109': {'ipaddress': '192.168.0.109',
                    'meta_data': {'created_at': 1634659520.7826385,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0624678},
+                                 'updated_at': 1643015354.99061},
                    'tag_criticality': 'offline'},
  '192.168.0.110': {'ipaddress': '192.168.0.110',
                    'meta_data': {'created_at': 1634659520.7761376,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0636754},
+                                 'updated_at': 1643015354.99128},
                    'tag_criticality': 'offline'},
  '192.168.0.116': {'ipaddress': '192.168.0.116',
                    'meta_data': {'created_at': 1642789810.5959208,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0649953},
+                                 'updated_at': 1643015354.9919431},
                    'tag_criticality': 'offline'},
  '192.168.0.120': {'ipaddress': '192.168.0.120',
                    'meta_data': {'created_at': 1640628312.3986723,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.066212},
+                                 'updated_at': 1643015354.9926622},
                    'tag_criticality': 'offline'},
  '192.168.0.127': {'ipaddress': '192.168.0.127',
                    'meta_data': {'created_at': 1642789810.595435,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0674176},
+                                 'updated_at': 1643015354.9933321},
                    'tag_criticality': 'offline'},
  '192.168.0.128': {'ipaddress': '192.168.0.128',
                    'meta_data': {'created_at': 1635178268.2743173,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0686948},
+                                 'updated_at': 1643015354.994001},
                    'tag_criticality': 'offline'},
  '192.168.0.132': {'ipaddress': '192.168.0.132',
                    'meta_data': {'created_at': 1642011668.1575994,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.069924},
+                                 'updated_at': 1643015354.9946704},
                    'tag_criticality': 'offline'},
  '192.168.0.147': {'ipaddress': '192.168.0.147',
                    'meta_data': {'created_at': 1634659520.7763453,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.0711246},
+                                 'updated_at': 1643015354.995335},
                    'tag_criticality': 'offline'},
  '192.168.0.149': {'ipaddress': '192.168.0.149',
                    'meta_data': {'created_at': 1634918888.6064017,
                                  'created_by': 'Network scan',
-                                 'updated_at': 1642962728.072389},
+                                 'updated_at': 1643015354.9960072},
                    'tag_criticality': 'offline'},
  '2e001c269bf8329b.fritz.box': {'ipaddress': '192.168.0.27',
                                 'meta_data': {'created_at': 1642271048.2362373,
                                               'created_by': 'Network scan',
-                                              'updated_at': 1642962728.0736103},
+                                              'updated_at': 1643015354.9967368},
                                 'tag_criticality': 'offline'},
  'Android-2.fritz.box': {'ipaddress': '192.168.0.117',
                          'meta_data': {'created_at': 1636478228.9067883,
                                        'created_by': 'Network scan',
-                                       'updated_at': 1642962728.0748103},
+                                       'updated_at': 1643015354.9974065},
                          'tag_criticality': 'offline'},
  'Android-3.fritz.box': {'ipaddress': '192.168.0.106',
                          'meta_data': {'created_at': 1635091813.683196,
                                        'created_by': 'Network scan',
-                                       'updated_at': 1642962728.076061},
+                                       'updated_at': 1643015354.9980702},
                          'tag_criticality': 'offline'},
  'Android-5.fritz.box': {'ipaddress': '192.168.0.108',
                          'meta_data': {'created_at': 1637342828.741417,
                                        'created_by': 'Network scan',
-                                       'updated_at': 1642962728.0773776},
+                                       'updated_at': 1643015354.9987319},
                          'tag_criticality': 'offline'},
  'Android-6.fritz.box': {'ipaddress': '192.168.0.118',
                          'meta_data': {'created_at': 1642616891.4934466,
                                        'created_by': 'Network scan',
-                                       'updated_at': 1642962728.0785885},
+                                       'updated_at': 1643015354.999395},
                          'tag_criticality': 'offline'},
  'Android.fritz.box': {'ipaddress': '192.168.0.103',
                        'meta_data': {'created_at': 1634659520.7756755,
                                      'created_by': 'Network scan',
-                                     'updated_at': 1642962728.079825},
+                                     'updated_at': 1643015355.0000494},
                        'tag_criticality': 'offline'},
  'ESP-271183.fritz.box': {'ipaddress': '192.168.0.114',
                           'meta_data': {'created_at': 1642530429.0000792,
                                         'created_by': 'Network scan',
-                                        'updated_at': 1642962728.0808618},
+                                        'updated_at': 1643015355.0007653},
                           'tag_criticality': 'offline'},
  'Echo-Show8.fritz.box': {'ipaddress': '192.168.0.119',
                           'meta_data': {'created_at': 1634659520.7741342,
                                         'created_by': 'Network scan',
-                                        'updated_at': 1642962728.0816548},
+                                        'updated_at': 1643015355.0014377},
                           'tag_criticality': 'offline'},
  'FireTV-Guest.fritz.box': {'ipaddress': '192.168.0.121',
                             'meta_data': {'created_at': 1634659520.7832856,
                                           'created_by': 'Network scan',
-                                          'updated_at': 1642962728.0824435},
+                                          'updated_at': 1643015355.002121},
                             'tag_criticality': 'offline'},
  'GW-A0C9A0D860E9.fritz.box': {'ipaddress': '192.168.0.25',
                                'meta_data': {'created_at': 1642271048.2290223,
                                              'created_by': 'Network scan',
-                                             'updated_at': 1642962728.083221},
+                                             'updated_at': 1643015355.0027823},
                                'tag_criticality': 'offline'},
  'NodeMCU-1_1.fritz.box': {'ipaddress': '192.168.0.143',
                            'meta_data': {'created_at': 1641406448.4647152,
                                          'created_by': 'Network scan',
-                                         'updated_at': 1642962728.083996},
+                                         'updated_at': 1643015355.003447},
                            'tag_criticality': 'offline'},
  'Ring-526584.fritz.box': {'ipaddress': '192.168.0.37',
                            'meta_data': {'created_at': 1642357512.4617114,
                                          'created_by': 'Network scan',
-                                         'updated_at': 1642962728.0848181},
+                                         'updated_at': 1643015355.0041113},
                            'tag_criticality': 'offline'},
  'T450s.fritz.box': {'ipaddress': '192.168.0.89',
                      'meta_data': {'created_at': 1635869948.9909117,
                                    'created_by': 'Network scan',
-                                   'updated_at': 1642962728.0854712},
+                                   'updated_at': 1643015355.0048208},
                      'tag_criticality': 'offline'},
  'TRADFRI-Gateway-a0c9a0d860e9.fritz.box': {'ipaddress': '192.168.0.22',
                                             'meta_data': {'created_at': 1634659520.7759254,
                                                           'created_by': 'Network '
                                                                         'scan',
-                                                          'updated_at': 1642962728.0861053},
+                                                          'updated_at': 1643015355.005481},
                                             'tag_criticality': 'offline'},
  'TahomaBox.fritz.box': {'ipaddress': '192.168.0.21',
                          'meta_data': {'created_at': 1634659520.782859,
                                        'created_by': 'Network scan',
-                                       'updated_at': 1642962728.0867374},
+                                       'updated_at': 1643015355.0061302},
                          'tag_criticality': 'offline'},
  'XBOXONE.fritz.box': {'ipaddress': '192.168.0.129',
                        'meta_data': {'created_at': 1641233529.7772737,
                                      'created_by': 'Network scan',
-                                     'updated_at': 1642962728.0873685},
+                                     'updated_at': 1643015355.0067728},
                        'tag_criticality': 'offline'},
  'Xiaomi-Mi9T.fritz.box': {'ipaddress': '192.168.0.142',
                            'meta_data': {'created_at': 1634659520.7824206,
                                          'created_by': 'Network scan',
-                                         'updated_at': 1642962728.087996},
+                                         'updated_at': 1643015355.0074203},
                            'tag_criticality': 'offline'},
  'amazon-f039d8527.fritz.box': {'ipaddress': '192.168.0.31',
                                 'meta_data': {'created_at': 1642357512.468196,
                                               'created_by': 'Network scan',
-                                              'updated_at': 1642962728.088718},
+                                              'updated_at': 1643015355.0080664},
                                 'tag_criticality': 'offline'},
  'blink-sync-module.fritz.box': {'ipaddress': '192.168.0.32',
                                  'meta_data': {'created_at': 1642357512.46937,
                                                'created_by': 'Network scan',
-                                               'updated_at': 1642962728.0893602},
+                                               'updated_at': 1643015355.008768},
                                  'tag_criticality': 'offline'},
  'fritz.powerline': {'ipaddress': '192.168.0.24',
                      'meta_data': {'created_at': 1642271048.235319,
                                    'created_by': 'Network scan',
-                                   'updated_at': 1642962728.0899942},
+                                   'updated_at': 1643015355.0094204},
                      'tag_criticality': 'offline'},
  'gateway-1206-2140-8817.fritz.box': {'ipaddress': '192.168.0.26',
                                       'meta_data': {'created_at': 1642271048.2357957,
                                                     'created_by': 'Network '
                                                                   'scan',
-                                                    'updated_at': 1642962728.090623},
+                                                    'updated_at': 1643015355.0100634},
                                       'tag_criticality': 'offline'},
  'localhost': {'meta_data': {'created_at': 1598003642.793133,
                              'created_by': 'cmkadmin',
-                             'updated_at': 1642962728.0912547}},
+                             'updated_at': 1643015355.0107048}},
  'neff-dishwasher-401010425335001522.fritz.box': {'ipaddress': '192.168.0.124',
                                                   'meta_data': {'created_at': 1634659520.7830703,
                                                                 'created_by': 'Network '
                                                                               'scan',
-                                                                'updated_at': 1642962728.0918875},
+                                                                'updated_at': 1643015355.011348},
                                                   'tag_criticality': 'offline'},
  'predator.fritz.box': {'ipaddress': '192.168.0.115',
                         'meta_data': {'created_at': 1634659520.7817087,
                                       'created_by': 'Network scan',
-                                      'updated_at': 1642962728.092581},
+                                      'updated_at': 1643015355.0119882},
                         'tag_criticality': 'offline'},
  'puppet.realm.local': {'ipaddress': '192.168.0.99',
                         'meta_data': {'created_at': 1634659520.7819686,
                                       'created_by': 'Network scan',
-                                      'updated_at': 1642962728.093238},
+                                      'updated_at': 1643015355.0126777},
                         'tag_criticality': 'offline'}})
diff --git a/conf.d/wato/outside/.wato b/conf.d/wato/outside/.wato
index 52f1eea..6af6757 100644
--- a/conf.d/wato/outside/.wato
+++ b/conf.d/wato/outside/.wato
@@ -1 +1 @@
-{'title': 'Outside', 'attributes': {'meta_data': {'created_at': 1598005215.562737, 'created_by': 'cmkadmin', 'updated_at': 1640252269.6981053}}, 'num_hosts': 1, 'lock': False, 'lock_subfolders': False, '__id': 'eb4a80999e8a429a8d1f08b4dcfbc0e5'}
+{'title': 'Outside', 'attributes': {'meta_data': {'created_at': 1598005215.562737, 'created_by': 'cmkadmin', 'updated_at': 1643015354.963691}}, 'num_hosts': 1, 'lock': False, 'lock_subfolders': False, '__id': 'eb4a80999e8a429a8d1f08b4dcfbc0e5'}
diff --git a/conf.d/wato/outside/hosts.mk b/conf.d/wato/outside/hosts.mk
index 3292535..4a065db 100644
--- a/conf.d/wato/outside/hosts.mk
+++ b/conf.d/wato/outside/hosts.mk
@@ -3,7 +3,15 @@
 
 all_hosts += ['euve130167.solusar.de']
 
-host_tags.update({'euve130167.solusar.de': {'site': 'realm', 'address_family': 'ip-v4-only', 'ip-v4': 'ip-v4', 'agent': 'cmk-agent', 'tcp': 'tcp', 'piggyback': 'auto-piggyback', 'snmp_ds': 'no-snmp', 'criticality': 'prod', 'networking': 'lan'}})
+host_tags.update({'euve130167.solusar.de': {'address_family': 'ip-v4-only',
+                           'agent': 'cmk-agent',
+                           'criticality': 'prod',
+                           'ip-v4': 'ip-v4',
+                           'networking': 'lan',
+                           'piggyback': 'auto-piggyback',
+                           'site': 'realm',
+                           'snmp_ds': 'no-snmp',
+                           'tcp': 'tcp'}})
 
 host_labels.update({})
 
@@ -12,4 +20,7 @@ ipaddresses.update({'euve130167.solusar.de': '62.75.247.110'})
 
 # Host attributes (needed for WATO)
 host_attributes.update(
-{'euve130167.solusar.de': {'ipaddress': '62.75.247.110', 'meta_data': {'created_at': 1598005355.0, 'created_by': 'cmkadmin', 'updated_at': 1640252269.7410512}}})
+{'euve130167.solusar.de': {'ipaddress': '62.75.247.110',
+                           'meta_data': {'created_at': 1598005355.0,
+                                         'created_by': 'cmkadmin',
+                                         'updated_at': 1643015355.09536}}})
diff --git a/conf.d/wato/outside/rules.mk b/conf.d/wato/outside/rules.mk
index 362f0d2..a52ee5e 100644
--- a/conf.d/wato/outside/rules.mk
+++ b/conf.d/wato/outside/rules.mk
@@ -1,66 +1,129 @@
-# Written by Checkmk store
-
 
 agent_config.setdefault('cmk_update_agent', [])
 
 agent_config['cmk_update_agent'] = [
-{'id': '068d1c07-53fe-45f3-a626-d3dc1d94d686', 'value': {'activated': True, 'server_data': {'usage': 'registration', 'server': 'realm.solusar.de', 'site': 'realm', 'protocol': 'https'}, 'interval': 3600, 'edition': '64bit', 'signature_keys': ['-----BEGIN CERTIFICATE-----\nMIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\nU2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\nMjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\nETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\nCIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\nZ0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\nBYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\nizqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\nqItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\ndZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\nSu6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\nsbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\naQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\nwFWG11DIXR5sSb78\n-----END CERTIFICATE-----\n']}, 'condition': {'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'disabled': True, 'description': 'Agent update extern'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': '068d1c07-53fe-45f3-a626-d3dc1d94d686',
+ 'options': {'description': 'Agent update extern', 'disabled': True},
+ 'value': {'activated': True,
+           'edition': '64bit',
+           'interval': 3600,
+           'server_data': {'protocol': 'https',
+                           'server': 'realm.solusar.de',
+                           'site': 'realm',
+                           'usage': 'registration'},
+           'signature_keys': ['-----BEGIN CERTIFICATE-----\n'
+                              'MIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\n'
+                              'U2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\n'
+                              'MjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\n'
+                              'ETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\n'
+                              'AQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\n'
+                              'CIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\n'
+                              'Z0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\n'
+                              'BYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\n'
+                              'izqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n'
+                              '028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\n'
+                              'qItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\n'
+                              'dZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\n'
+                              'Su6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\n'
+                              'sbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\n'
+                              'aQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\n'
+                              'wFWG11DIXR5sSb78\n'
+                              '-----END CERTIFICATE-----\n']}},
 ] + agent_config['cmk_update_agent']
 
 
 agent_config.setdefault('custom_files', [])
 
 agent_config['custom_files'] = [
-{'id': '31c40de4-d2e3-4da7-ab97-d405054eb5aa', 'value': ['user_beancounters'], 'condition': {'host_name': ['euve130167.solusar.de'], 'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'description': 'user_beancounters', 'comment': 'script searches for following vaules: shmpasges, tcpsndbuf, tcprcvbuf\n', 'docu_url': 'caelebfi'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH,
+               'host_name': ['euve130167.solusar.de']},
+ 'id': '31c40de4-d2e3-4da7-ab97-d405054eb5aa',
+ 'options': {'comment': 'script searches for following vaules: shmpasges, '
+                        'tcpsndbuf, tcprcvbuf\n',
+             'description': 'user_beancounters',
+             'docu_url': 'caelebfi'},
+ 'value': ['user_beancounters']},
 ] + agent_config['custom_files']
 
 
 agent_config.setdefault('mk_iptables', [])
 
 agent_config['mk_iptables'] = [
-{'id': '44d34a15-4d35-4744-9d28-49a34ef5ac85', 'value': True, 'condition': {'host_folder': '/%s/' % FOLDER_PATH}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': '44d34a15-4d35-4744-9d28-49a34ef5ac85',
+ 'value': True},
 ] + agent_config['mk_iptables']
 
 
 agent_config.setdefault('mk_logwatch', [])
 
 agent_config['mk_logwatch'] = [
-{'id': '10b685fe-174f-44c9-b07a-6434031d36fc', 'value': {'file_section': {'logfiles': ['/var/log/auth.log', '/var/log/syslog', '/var/log/mail.log', '/var/log/kern.log'], 'maxlinesize': 250, 'overflow': 'C', 'context': True, 'patterns': []}}, 'condition': {'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'description': 'LOG-File check'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': '10b685fe-174f-44c9-b07a-6434031d36fc',
+ 'options': {'description': 'LOG-File check'},
+ 'value': {'file_section': {'context': True,
+                            'logfiles': ['/var/log/auth.log',
+                                         '/var/log/syslog',
+                                         '/var/log/mail.log',
+                                         '/var/log/kern.log'],
+                            'maxlinesize': 250,
+                            'overflow': 'C',
+                            'patterns': []}}},
 ] + agent_config['mk_logwatch']
 
 
 agent_config.setdefault('mk_mongodb', [])
 
 agent_config['mk_mongodb'] = [
-{'id': '295b14fa-0b0c-493a-b445-ebecc4ff1a7c', 'value': True, 'condition': {'host_folder': '/%s/' % FOLDER_PATH}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': '295b14fa-0b0c-493a-b445-ebecc4ff1a7c',
+ 'value': True},
 ] + agent_config['mk_mongodb']
 
 
 agent_config.setdefault('mk_redis', [])
 
 agent_config['mk_redis'] = [
-{'id': 'ac6b09a7-b249-42c4-8c2a-e6422560b3b1', 'value': ('static', [('localhost', '127.0.0.1', 6379, '3<kq43j=uB<d7q-e')]), 'condition': {'host_folder': '/%s/' % FOLDER_PATH}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': 'ac6b09a7-b249-42c4-8c2a-e6422560b3b1',
+ 'value': ('static', [('localhost', '127.0.0.1', 6379, '3<kq43j=uB<d7q-e')])},
 ] + agent_config['mk_redis']
 
 
 checkgroup_parameters.setdefault('systemd_services_summary', [])
 
 checkgroup_parameters['systemd_services_summary'] = [
-{'id': 'aadcdb69-77ac-42f6-934f-c361168afb02', 'value': {'ignored': ['networking']}, 'condition': {'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'description': 'networking service ausklammern'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH},
+ 'id': 'aadcdb69-77ac-42f6-934f-c361168afb02',
+ 'options': {'description': 'networking service ausklammern'},
+ 'value': {'ignored': ['networking']}},
 ] + checkgroup_parameters['systemd_services_summary']
 
 
 globals().setdefault('datasource_programs', [])
 
 datasource_programs = [
-{'id': '79de6c17-1b3e-496e-8661-64371be2a94e', 'value': 'ssh -T -oStrictHostKeyChecking=no caelebfi@62.75.247.110', 'condition': {'host_name': ['euve130167.solusar.de'], 'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'description': 'access cmk via ssh'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH,
+               'host_name': ['euve130167.solusar.de']},
+ 'id': '79de6c17-1b3e-496e-8661-64371be2a94e',
+ 'options': {'description': 'access cmk via ssh'},
+ 'value': 'ssh -T -oStrictHostKeyChecking=no caelebfi@62.75.247.110'},
 ] + datasource_programs
 
 
 globals().setdefault('ignored_services', [])
 
 ignored_services = [
-{'id': '425dfa9f-e5d2-44f8-b95d-01a9ef50682b', 'value': True, 'condition': {'host_name': ['euve130167.solusar.de'], 'service_description': [{'$regex': 'PostgreSQL Instance POSTGRES$'}, {'$regex': 'PostgreSQL Instance MAIN$'}, {'$regex': 'PostgreSQL Connection Time MAIN$'}], 'host_folder': '/%s/' % FOLDER_PATH}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH,
+               'host_name': ['euve130167.solusar.de'],
+               'service_description': [{'$regex': 'PostgreSQL Instance '
+                                                  'POSTGRES$'},
+                                       {'$regex': 'PostgreSQL Instance MAIN$'},
+                                       {'$regex': 'PostgreSQL Connection Time '
+                                                  'MAIN$'}]},
+ 'id': '425dfa9f-e5d2-44f8-b95d-01a9ef50682b',
+ 'value': True},
 ] + ignored_services
 
 
diff --git a/conf.d/wato/raspberrys/.wato b/conf.d/wato/raspberrys/.wato
index 8a833fd..6672f94 100644
--- a/conf.d/wato/raspberrys/.wato
+++ b/conf.d/wato/raspberrys/.wato
@@ -1 +1 @@
-{'title': 'Raspberrys', 'attributes': {'meta_data': {'created_at': 1598003754.002505, 'created_by': 'cmkadmin', 'updated_at': 1643011943.3354728}}, 'num_hosts': 1, 'lock': False, 'lock_subfolders': False, '__id': 'ecf48b2e044d49a1af176ac4ed4886d3'}
+{'title': 'Raspberrys', 'attributes': {'meta_data': {'created_at': 1598003754.002505, 'created_by': 'cmkadmin', 'updated_at': 1643015354.9670765}}, 'num_hosts': 1, 'lock': False, 'lock_subfolders': False, '__id': 'ecf48b2e044d49a1af176ac4ed4886d3'}
diff --git a/conf.d/wato/raspberrys/hosts.mk b/conf.d/wato/raspberrys/hosts.mk
index 7a8d44f..70d2a0d 100644
--- a/conf.d/wato/raspberrys/hosts.mk
+++ b/conf.d/wato/raspberrys/hosts.mk
@@ -23,4 +23,4 @@ host_attributes.update(
 {'serviceraspi.realm.local': {'ipaddress': '192.168.0.28',
                               'meta_data': {'created_at': 1598003779.0,
                                             'created_by': 'cmkadmin',
-                                            'updated_at': 1643011943.3479183}}})
+                                            'updated_at': 1643015355.1051297}}})
diff --git a/conf.d/wato/raspberrys/rules.mk b/conf.d/wato/raspberrys/rules.mk
index ce84f21..5210e8a 100644
--- a/conf.d/wato/raspberrys/rules.mk
+++ b/conf.d/wato/raspberrys/rules.mk
@@ -1,10 +1,36 @@
-# Written by Checkmk store
-
 
 agent_config.setdefault('cmk_update_agent', [])
 
 agent_config['cmk_update_agent'] = [
-{'id': 'feea212e-2efb-4c51-ab0f-21690294d4e8', 'value': {'activated': True, 'server_data': {'usage': 'always', 'server': '192.168.0.99', 'site': 'realm', 'protocol': 'http'}, 'interval': 3600, 'edition': 'script', 'signature_keys': ['-----BEGIN CERTIFICATE-----\nMIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\nU2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\nMjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\nETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\nCIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\nZ0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\nBYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\nizqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\nqItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\ndZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\nSu6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\nsbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\naQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\nwFWG11DIXR5sSb78\n-----END CERTIFICATE-----\n']}, 'condition': {'host_name': {'$nor': ['euve130167.solusar.de']}, 'host_folder': '/%s/' % FOLDER_PATH}, 'options': {'description': 'auto-deployment rule'}},
+{'condition': {'host_folder': '/%s/' % FOLDER_PATH,
+               'host_name': {'$nor': ['euve130167.solusar.de']}},
+ 'id': 'feea212e-2efb-4c51-ab0f-21690294d4e8',
+ 'options': {'description': 'auto-deployment rule'},
+ 'value': {'activated': True,
+           'edition': 'script',
+           'interval': 3600,
+           'server_data': {'protocol': 'http',
+                           'server': '192.168.0.99',
+                           'site': 'realm',
+                           'usage': 'always'},
+           'signature_keys': ['-----BEGIN CERTIFICATE-----\n'
+                              'MIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\n'
+                              'U2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\n'
+                              'MjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\n'
+                              'ETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\n'
+                              'AQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\n'
+                              'CIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\n'
+                              'Z0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\n'
+                              'BYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\n'
+                              'izqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n'
+                              '028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\n'
+                              'qItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\n'
+                              'dZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\n'
+                              'Su6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\n'
+                              'sbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\n'
+                              'aQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\n'
+                              'wFWG11DIXR5sSb78\n'
+                              '-----END CERTIFICATE-----\n']}},
 ] + agent_config['cmk_update_agent']
 
 
diff --git a/conf.d/wato/rules.mk b/conf.d/wato/rules.mk
index 5eb3608..6ed3ff6 100644
--- a/conf.d/wato/rules.mk
+++ b/conf.d/wato/rules.mk
@@ -1,158 +1,303 @@
-# Written by Checkmk store
-
 
 active_checks.setdefault('cmk_inv', [])
 
 active_checks['cmk_inv'] = [
-{'id': '078cbbf1-dfcb-4a0e-863c-46ba5b373e53', 'value': {'status_data_inventory': True}, 'condition': {'host_labels': {'cmk/docker_object': 'node'}}},
+{'condition': {'host_labels': {'cmk/docker_object': 'node'}},
+ 'id': '078cbbf1-dfcb-4a0e-863c-46ba5b373e53',
+ 'value': {'status_data_inventory': True}},
 ] + active_checks['cmk_inv']
 
 
 active_checks.setdefault('http', [])
 
 active_checks['http'] = [
-{'id': '5a3560c3-48c1-4834-96a9-cb41869fccfb', 'value': {'name': 'Web Check', 'host': {'address': '192.168.0.100', 'port': 443}, 'mode': ('url', {'uri': '/PRESENTATION/HTML/TOP/INDEX.HTML', 'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['epson-xp-8600.realm.local']}, 'options': {'description': 'check webserver status'}},
-{'id': '00472ca8-df94-4bb2-9dde-e0c52d11bae8', 'value': {'name': 'Web Check Gitea', 'host': {'address': 'gitea.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check gitea status'}},
-{'id': 'cd277099-1fa8-4969-af8e-8a439a04c28c', 'value': {'name': 'Web Check ADGuard', 'host': {'address': 'adguard.realm.local', 'port': 443}, 'mode': ('url', {'uri': '/login.html', 'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check adguard status'}},
-{'id': '40d08b3b-bacc-4594-8cbd-ac8c43cc96ab', 'value': {'name': 'Web Check Portainer', 'host': {'address': 'portainer.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check portainer status'}},
-{'id': '3a98cd94-057f-4800-8e55-3b9962b7c6eb', 'value': {'name': 'Web Check Grafana', 'host': {'address': 'grafana.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check grafana status'}},
-{'id': '639d093d-d40f-483c-b1a0-3604c85a75c1', 'value': {'name': 'Web Check InfluxDB', 'host': {'address': 'influxdb.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check InfluxDB status'}},
-{'id': 'deaa0f42-c339-4b25-8f8b-f224cd7e5655', 'value': {'name': 'Web Check OpenHAB', 'host': {'address': 'openhab.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check OpenHAB status'}},
-{'id': '94856693-93b8-4512-8893-0132012b4bd6', 'value': {'name': 'Web Check PhotoPrism', 'host': {'address': 'photoprism.realm.local', 'port': 443}, 'mode': ('url', {'ssl': 'auto', 'urlize': True})}, 'condition': {'host_name': ['serviceraspi.realm.local']}, 'options': {'description': 'check PhotoPrism status'}},
-{'id': 'c805bfff-9ac1-4d31-88cb-7db026b11061', 'value': {'name': 'Web Check Switch', 'host': {'address': '192.168.0.3', 'port': 80}, 'mode': ('url', {'urlize': True})}, 'condition': {'host_name': ['switch.realm.local']}, 'options': {'description': 'check Switch status'}},
+{'condition': {'host_name': ['epson-xp-8600.realm.local']},
+ 'id': '5a3560c3-48c1-4834-96a9-cb41869fccfb',
+ 'options': {'description': 'check webserver status'},
+ 'value': {'host': {'address': '192.168.0.100', 'port': 443},
+           'mode': ('url',
+                    {'ssl': 'auto',
+                     'uri': '/PRESENTATION/HTML/TOP/INDEX.HTML',
+                     'urlize': True}),
+           'name': 'Web Check'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': '00472ca8-df94-4bb2-9dde-e0c52d11bae8',
+ 'options': {'description': 'check gitea status'},
+ 'value': {'host': {'address': 'gitea.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check Gitea'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': 'cd277099-1fa8-4969-af8e-8a439a04c28c',
+ 'options': {'description': 'check adguard status'},
+ 'value': {'host': {'address': 'adguard.realm.local', 'port': 443},
+           'mode': ('url',
+                    {'ssl': 'auto', 'uri': '/login.html', 'urlize': True}),
+           'name': 'Web Check ADGuard'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': '40d08b3b-bacc-4594-8cbd-ac8c43cc96ab',
+ 'options': {'description': 'check portainer status'},
+ 'value': {'host': {'address': 'portainer.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check Portainer'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': '3a98cd94-057f-4800-8e55-3b9962b7c6eb',
+ 'options': {'description': 'check grafana status'},
+ 'value': {'host': {'address': 'grafana.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check Grafana'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': '639d093d-d40f-483c-b1a0-3604c85a75c1',
+ 'options': {'description': 'check InfluxDB status'},
+ 'value': {'host': {'address': 'influxdb.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check InfluxDB'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': 'deaa0f42-c339-4b25-8f8b-f224cd7e5655',
+ 'options': {'description': 'check OpenHAB status'},
+ 'value': {'host': {'address': 'openhab.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check OpenHAB'}},
+{'condition': {'host_name': ['serviceraspi.realm.local']},
+ 'id': '94856693-93b8-4512-8893-0132012b4bd6',
+ 'options': {'description': 'check PhotoPrism status'},
+ 'value': {'host': {'address': 'photoprism.realm.local', 'port': 443},
+           'mode': ('url', {'ssl': 'auto', 'urlize': True}),
+           'name': 'Web Check PhotoPrism'}},
+{'condition': {'host_name': ['switch.realm.local']},
+ 'id': 'c805bfff-9ac1-4d31-88cb-7db026b11061',
+ 'options': {'description': 'check Switch status'},
+ 'value': {'host': {'address': '192.168.0.3', 'port': 80},
+           'mode': ('url', {'urlize': True}),
+           'name': 'Web Check Switch'}},
 ] + active_checks['http']
 
 
 agent_config.setdefault('cmk_update_agent', [])
 
 agent_config['cmk_update_agent'] = [
-{'id': 'e9588a9e-4ef1-4fe7-8085-68d4e204d2a5', 'value': {'activated': True, 'server_data': {'usage': 'always', 'server': '192.168.0.99', 'site': 'realm', 'protocol': 'http'}, 'interval': 3600, 'edition': '64bit', 'signature_keys': ['-----BEGIN CERTIFICATE-----\nMIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\nU2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\nMjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\nETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\nCIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\nZ0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\nBYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\nizqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\nqItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\ndZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\nSu6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\nsbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\naQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\nwFWG11DIXR5sSb78\n-----END CERTIFICATE-----\n']}, 'condition': {'host_name': {'$nor': ['euve130167.solusar.de']}}, 'options': {'description': 'auto-deployment rule'}},
+{'condition': {'host_name': {'$nor': ['euve130167.solusar.de']}},
+ 'id': 'e9588a9e-4ef1-4fe7-8085-68d4e204d2a5',
+ 'options': {'description': 'auto-deployment rule'},
+ 'value': {'activated': True,
+           'edition': '64bit',
+           'interval': 3600,
+           'server_data': {'protocol': 'http',
+                           'server': '192.168.0.99',
+                           'site': 'realm',
+                           'usage': 'always'},
+           'signature_keys': ['-----BEGIN CERTIFICATE-----\n'
+                              'MIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\n'
+                              'U2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\n'
+                              'MjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\n'
+                              'ETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\n'
+                              'AQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\n'
+                              'CIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\n'
+                              'Z0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\n'
+                              'BYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\n'
+                              'izqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n'
+                              '028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\n'
+                              'qItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\n'
+                              'dZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\n'
+                              'Su6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\n'
+                              'sbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\n'
+                              'aQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\n'
+                              'wFWG11DIXR5sSb78\n'
+                              '-----END CERTIFICATE-----\n']}},
 ] + agent_config['cmk_update_agent']
 
 
 agent_config.setdefault('custom_files', [])
 
 agent_config['custom_files'] = [
-{'id': 'affad557-22ce-450b-8567-a96e7b896684', 'value': ['my_mrpe_checks'], 'condition': {'host_name': ['serviceraspi.realm.local', 'localhost']}, 'options': {'description': 'custom mrpe checks'}},
+{'condition': {'host_name': ['serviceraspi.realm.local', 'localhost']},
+ 'id': 'affad557-22ce-450b-8567-a96e7b896684',
+ 'options': {'description': 'custom mrpe checks'},
+ 'value': ['my_mrpe_checks']},
 ] + agent_config['custom_files']
 
 
 agent_config.setdefault('mk_apt', [])
 
 agent_config['mk_apt'] = [
-{'id': 'b4471dac-d08e-4318-b504-ab2dc05695a0', 'value': {'interval': 86400, 'method': 'upgrade', 'update': True}, 'condition': {}, 'options': {'description': 'apt updates'}},
+{'condition': {},
+ 'id': 'b4471dac-d08e-4318-b504-ab2dc05695a0',
+ 'options': {'description': 'apt updates'},
+ 'value': {'interval': 86400, 'method': 'upgrade', 'update': True}},
 ] + agent_config['mk_apt']
 
 
 agent_config.setdefault('mk_docker', [])
 
 agent_config['mk_docker'] = [
-{'id': 'd56238d4-e233-4f5b-ab4a-d18a23e56be6', 'value': {'node': [], 'containers': [], 'container_id': 'short'}, 'condition': {'host_name': {'$nor': ['euve130167.solusar.de']}}, 'options': {'description': 'Docker', 'docu_url': 'caelebfi'}},
+{'condition': {'host_name': {'$nor': ['euve130167.solusar.de']}},
+ 'id': 'd56238d4-e233-4f5b-ab4a-d18a23e56be6',
+ 'options': {'description': 'Docker', 'docu_url': 'caelebfi'},
+ 'value': {'container_id': 'short', 'containers': [], 'node': []}},
 ] + agent_config['mk_docker']
 
 
 agent_config.setdefault('mk_inventory', [])
 
 agent_config['mk_inventory'] = [
-{'id': 'f5fd9995-14b5-480a-a38b-b067fb67ca6a', 'value': {'interval': 14400, 'reg_paths': ['Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall', 'Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall']}, 'condition': {}},
+{'condition': {},
+ 'id': 'f5fd9995-14b5-480a-a38b-b067fb67ca6a',
+ 'value': {'interval': 14400,
+           'reg_paths': ['Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+                         'Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall']}},
 ] + agent_config['mk_inventory']
 
 
 agent_config.setdefault('mk_logins', [])
 
 agent_config['mk_logins'] = [
-{'id': '56115e83-83f6-4a4f-af11-1f86133381d2', 'value': True, 'condition': {'host_name': ['euve130167.solusar.de']}, 'options': {'description': 'Logins Check'}},
+{'condition': {'host_name': ['euve130167.solusar.de']},
+ 'id': '56115e83-83f6-4a4f-af11-1f86133381d2',
+ 'options': {'description': 'Logins Check'},
+ 'value': True},
 ] + agent_config['mk_logins']
 
 
 agent_config.setdefault('mk_mysql', [])
 
 agent_config['mk_mysql'] = [
-{'id': '8969a38b-54ee-4c80-b2e1-da25add718ef', 'value': {'credentials': ('monitor', '3TghcItqnx4unPfEY9wa')}, 'condition': {'host_name': ['euve130167.solusar.de']}, 'options': {'description': 'MySQL check'}},
+{'condition': {'host_name': ['euve130167.solusar.de']},
+ 'id': '8969a38b-54ee-4c80-b2e1-da25add718ef',
+ 'options': {'description': 'MySQL check'},
+ 'value': {'credentials': ('monitor', '3TghcItqnx4unPfEY9wa')}},
 ] + agent_config['mk_mysql']
 
 
 agent_config.setdefault('netstat', [])
 
 agent_config['netstat'] = [
-{'id': '4f18c90f-021f-4267-8249-1cdf2e60eb2d', 'value': {}, 'condition': {}},
+{'condition': {}, 'id': '4f18c90f-021f-4267-8249-1cdf2e60eb2d', 'value': {}},
 ] + agent_config['netstat']
 
 
 agent_config.setdefault('nginx_status', [])
 
 agent_config['nginx_status'] = [
-{'id': '79825c5b-95c1-44df-96d5-e1b05bd63c97', 'value': ('static', [{'protocol': 'http', 'address': '127.0.0.1', 'port': 80}]), 'condition': {'host_name': ['euve130167.solusar.de', 'serviceraspi.realm.local']}, 'options': {'description': 'Nginx Checks', 'docu_url': 'caelebfi'}},
+{'condition': {'host_name': ['euve130167.solusar.de',
+                             'serviceraspi.realm.local']},
+ 'id': '79825c5b-95c1-44df-96d5-e1b05bd63c97',
+ 'options': {'description': 'Nginx Checks', 'docu_url': 'caelebfi'},
+ 'value': ('static',
+           [{'address': '127.0.0.1', 'port': 80, 'protocol': 'http'}])},
 ] + agent_config['nginx_status']
 
 
 agent_config.setdefault('smart', [])
 
 agent_config['smart'] = [
-{'id': '0e9b9e70-0dd2-41c8-b19f-680502d47ea5', 'value': True, 'condition': {'host_name': ['localhost']}, 'options': {'description': 'S.M.A.R.T. Check'}},
+{'condition': {'host_name': ['localhost']},
+ 'id': '0e9b9e70-0dd2-41c8-b19f-680502d47ea5',
+ 'options': {'description': 'S.M.A.R.T. Check'},
+ 'value': True},
 ] + agent_config['smart']
 
 
 globals().setdefault('bulkwalk_hosts', [])
 
 bulkwalk_hosts = [
-{'id': '17f65e16-29c0-4321-904c-418862aa1edf', 'value': True, 'condition': {'host_tags': {'snmp': 'snmp', 'snmp_ds': {'$ne': 'snmp-v1'}}}, 'options': {'description': 'Hosts with the tag "snmp-v1" must not use bulkwalk'}},
+{'condition': {'host_tags': {'snmp': 'snmp', 'snmp_ds': {'$ne': 'snmp-v1'}}},
+ 'id': '17f65e16-29c0-4321-904c-418862aa1edf',
+ 'options': {'description': 'Hosts with the tag "snmp-v1" must not use '
+                            'bulkwalk'},
+ 'value': True},
 ] + bulkwalk_hosts
 
 
 checkgroup_parameters.setdefault('if', [])
 
 checkgroup_parameters['if'] = [
-{'id': '26e4e1b3-e84d-4ace-bd2e-b08275f4a6ae', 'value': {'unit': 'bit'}, 'condition': {}},
+{'condition': {},
+ 'id': '26e4e1b3-e84d-4ace-bd2e-b08275f4a6ae',
+ 'value': {'unit': 'bit'}},
 ] + checkgroup_parameters['if']
 
 
 globals().setdefault('cmc_host_rrd_config', [])
 
 cmc_host_rrd_config = [
-{'id': '6f0de5d6-c82e-4282-9df1-6e9d083edec9', 'value': {'format': 'cmc_single', 'cfs': ['MIN', 'MAX', 'AVERAGE'], 'step': 60, 'rras': [(50.0, 1, 2880), (50.0, 5, 2880), (50.0, 30, 4320), (50.0, 360, 5840)]}, 'condition': {}, 'options': {'description': 'Default RRD configuration, using new single RRD format'}},
+{'condition': {},
+ 'id': '6f0de5d6-c82e-4282-9df1-6e9d083edec9',
+ 'options': {'description': 'Default RRD configuration, using new single RRD '
+                            'format'},
+ 'value': {'cfs': ['MIN', 'MAX', 'AVERAGE'],
+           'format': 'cmc_single',
+           'rras': [(50.0, 1, 2880),
+                    (50.0, 5, 2880),
+                    (50.0, 30, 4320),
+                    (50.0, 360, 5840)],
+           'step': 60}},
 ] + cmc_host_rrd_config
 
 
 globals().setdefault('cmc_service_rrd_config', [])
 
 cmc_service_rrd_config = [
-{'id': '9a3a69c8-29b1-445f-82d3-44d7eb54f016', 'value': {'format': 'cmc_single', 'cfs': ['MIN', 'MAX', 'AVERAGE'], 'step': 60, 'rras': [(50.0, 1, 2880), (50.0, 5, 2880), (50.0, 30, 4320), (50.0, 360, 5840)]}, 'condition': {}, 'options': {'description': 'Default RRD configuration, using new single RRD format'}},
+{'condition': {},
+ 'id': '9a3a69c8-29b1-445f-82d3-44d7eb54f016',
+ 'options': {'description': 'Default RRD configuration, using new single RRD '
+                            'format'},
+ 'value': {'cfs': ['MIN', 'MAX', 'AVERAGE'],
+           'format': 'cmc_single',
+           'rras': [(50.0, 1, 2880),
+                    (50.0, 5, 2880),
+                    (50.0, 30, 4320),
+                    (50.0, 360, 5840)],
+           'step': 60}},
 ] + cmc_service_rrd_config
 
 
 extra_host_conf.setdefault('notification_options', [])
 
 extra_host_conf['notification_options'] = [
-{'id': '8c0aa135-6c56-483e-a02a-9d5a07ac942a', 'value': 'd,r,f,s', 'condition': {}},
+{'condition': {},
+ 'id': '8c0aa135-6c56-483e-a02a-9d5a07ac942a',
+ 'value': 'd,r,f,s'},
 ] + extra_host_conf['notification_options']
 
 
 extra_service_conf.setdefault('check_interval', [])
 
 extra_service_conf['check_interval'] = [
-{'id': '6d3c5e95-f2a0-465f-869b-d5df38095308', 'value': 1440.0, 'condition': {'service_description': [{'$regex': 'Check_MK HW/SW Inventory$'}]}, 'options': {'description': 'Restrict HW/SW-Inventory to once a day'}},
+{'condition': {'service_description': [{'$regex': 'Check_MK HW/SW '
+                                                  'Inventory$'}]},
+ 'id': '6d3c5e95-f2a0-465f-869b-d5df38095308',
+ 'options': {'description': 'Restrict HW/SW-Inventory to once a day'},
+ 'value': 1440.0},
 ] + extra_service_conf['check_interval']
 
 
 globals().setdefault('host_check_commands', [])
 
 host_check_commands = [
-{'id': '4c533a26-a8b8-48d9-8d46-db776225a86c', 'value': ('service', 'Docker container status'), 'condition': {'host_labels': {'cmk/docker_object': 'container'}}, 'options': {'description': 'Make all docker container host states base on the "Docker container status" service'}},
+{'condition': {'host_labels': {'cmk/docker_object': 'container'}},
+ 'id': '4c533a26-a8b8-48d9-8d46-db776225a86c',
+ 'options': {'description': 'Make all docker container host states base on the '
+                            '"Docker container status" service'},
+ 'value': ('service', 'Docker container status')},
 ] + host_check_commands
 
 
 globals().setdefault('host_contactgroups', [])
 
 host_contactgroups = [
-{'id': '6c4ac064-a117-4246-9a63-66f86db48930', 'value': 'all', 'condition': {}, 'options': {'description': 'Put all hosts into the contact group "all"'}},
+{'condition': {},
+ 'id': '6c4ac064-a117-4246-9a63-66f86db48930',
+ 'options': {'description': 'Put all hosts into the contact group "all"'},
+ 'value': 'all'},
 ] + host_contactgroups
 
 
 globals().setdefault('inventory_df_rules', [])
 
 inventory_df_rules = [
-{'id': '9b3e15f7-eff9-4ffa-8deb-7c768c57fdb9', 'value': {'ignore_fs_types': ['tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660'], 'never_ignore_mountpoints': ['~.*/omd/sites/[^/]+/tmp$']}, 'condition': {'host_labels': {'cmk/check_mk_server': 'yes'}}},
+{'condition': {'host_labels': {'cmk/check_mk_server': 'yes'}},
+ 'id': '9b3e15f7-eff9-4ffa-8deb-7c768c57fdb9',
+ 'value': {'ignore_fs_types': ['tmpfs', 'nfs', 'smbfs', 'cifs', 'iso9660'],
+           'never_ignore_mountpoints': ['~.*/omd/sites/[^/]+/tmp$']}},
 ] + inventory_df_rules
 
 
@@ -162,28 +307,47 @@ if only_hosts is None:
     only_hosts = []
 
 only_hosts = [
-{'id': '5020d388-2319-45ad-8f73-c40e8927bc41', 'value': True, 'condition': {'host_tags': {'criticality': {'$ne': 'offline'}}}, 'options': {'description': 'Do not monitor hosts with the tag "offline"'}},
+{'condition': {'host_tags': {'criticality': {'$ne': 'offline'}}},
+ 'id': '5020d388-2319-45ad-8f73-c40e8927bc41',
+ 'options': {'description': 'Do not monitor hosts with the tag "offline"'},
+ 'value': True},
 ] + only_hosts
 
 
 globals().setdefault('periodic_discovery', [])
 
 periodic_discovery = [
-{'id': '218a9cb6-7134-4bfc-b2f9-2657fa6ca1fb', 'value': {'severity_unmonitored': 1, 'severity_vanished': 0, 'check_interval': 120.0, 'inventory_check_do_scan': True}, 'condition': {}, 'options': {'description': 'Perform every two hours a service discovery'}},
+{'condition': {},
+ 'id': '218a9cb6-7134-4bfc-b2f9-2657fa6ca1fb',
+ 'options': {'description': 'Perform every two hours a service discovery'},
+ 'value': {'check_interval': 120.0,
+           'inventory_check_do_scan': True,
+           'severity_unmonitored': 1,
+           'severity_vanished': 0}},
 ] + periodic_discovery
 
 
 globals().setdefault('ping_levels', [])
 
 ping_levels = [
-{'id': 'cf1db287-5f50-406f-a011-bb1eec1417d3', 'value': {'rta': (1500.0, 3000.0), 'loss': (80.0, 100.0), 'packets': 6, 'timeout': 20}, 'condition': {'host_tags': {'networking': 'wan'}}, 'options': {'description': 'Allow longer round trip times when pinging WAN hosts'}},
+{'condition': {'host_tags': {'networking': 'wan'}},
+ 'id': 'cf1db287-5f50-406f-a011-bb1eec1417d3',
+ 'options': {'description': 'Allow longer round trip times when pinging WAN '
+                            'hosts'},
+ 'value': {'loss': (80.0, 100.0),
+           'packets': 6,
+           'rta': (1500.0, 3000.0),
+           'timeout': 20}},
 ] + ping_levels
 
 
 special_agents.setdefault('fritzbox', [])
 
 special_agents['fritzbox'] = [
-{'id': '04f3e578-4e29-460f-bd9d-713a57f94154', 'value': {'timeout': 10}, 'condition': {'host_name': ['fritz.box']}, 'options': {'description': 'Fritz Checks'}},
+{'condition': {'host_name': ['fritz.box']},
+ 'id': '04f3e578-4e29-460f-bd9d-713a57f94154',
+ 'options': {'description': 'Fritz Checks'},
+ 'value': {'timeout': 10}},
 ] + special_agents['fritzbox']
 
 
diff --git a/conf.d/wato/technik/.wato b/conf.d/wato/technik/.wato
index 831496d..abdb85c 100644
--- a/conf.d/wato/technik/.wato
+++ b/conf.d/wato/technik/.wato
@@ -1 +1 @@
-{'title': 'Technik', 'attributes': {'meta_data': {'created_at': 1641453792.0388424, 'updated_at': 1641453844.4455795, 'created_by': 'caelebfi'}}, 'num_hosts': 4, 'lock': False, 'lock_subfolders': False, '__id': 'aa6c5847566a480e8df61e484275a109'}
+{'title': 'Technik', 'attributes': {'meta_data': {'created_at': 1641453792.0388424, 'updated_at': 1643015354.961505, 'created_by': 'caelebfi'}}, 'num_hosts': 4, 'lock': False, 'lock_subfolders': False, '__id': 'aa6c5847566a480e8df61e484275a109'}
diff --git a/conf.d/wato/technik/hosts.mk b/conf.d/wato/technik/hosts.mk
index f90fb52..0145120 100644
--- a/conf.d/wato/technik/hosts.mk
+++ b/conf.d/wato/technik/hosts.mk
@@ -1,18 +1,82 @@
 # Created by WATO
 # encoding: utf-8
 
-all_hosts += ['epson-xp-8600.realm.local', 'fritz.box', 'switch.realm.local', 'syno.realm.local']
+all_hosts += ['epson-xp-8600.realm.local',
+ 'fritz.box',
+ 'switch.realm.local',
+ 'syno.realm.local']
 
-host_tags.update({'epson-xp-8600.realm.local': {'site': 'realm', 'address_family': 'ip-v4-only', 'ip-v4': 'ip-v4', 'agent': 'special-agents', 'tcp': 'tcp', 'piggyback': 'auto-piggyback', 'snmp_ds': 'snmp-v2', 'snmp': 'snmp', 'criticality': 'prod', 'networking': 'lan'}, 'fritz.box': {'site': 'realm', 'address_family': 'ip-v4-only', 'ip-v4': 'ip-v4', 'agent': 'cmk-agent', 'tcp': 'tcp', 'piggyback': 'auto-piggyback', 'snmp_ds': 'no-snmp', 'criticality': 'prod', 'networking': 'lan'}, 'switch.realm.local': {'site': 'realm', 'address_family': 'ip-v4-only', 'ip-v4': 'ip-v4', 'agent': 'no-agent', 'piggyback': 'auto-piggyback', 'snmp_ds': 'no-snmp', 'criticality': 'prod', 'networking': 'lan', 'ping': 'ping'}, 'syno.realm.local': {'site': 'realm', 'address_family': 'ip-v4-only', 'ip-v4': 'ip-v4', 'agent': 'no-agent', 'piggyback': 'auto-piggyback', 'snmp_ds': 'snmp-v2', 'snmp': 'snmp', 'criticality': 'prod', 'networking': 'lan'}})
+host_tags.update({'epson-xp-8600.realm.local': {'address_family': 'ip-v4-only',
+                               'agent': 'special-agents',
+                               'criticality': 'prod',
+                               'ip-v4': 'ip-v4',
+                               'networking': 'lan',
+                               'piggyback': 'auto-piggyback',
+                               'site': 'realm',
+                               'snmp': 'snmp',
+                               'snmp_ds': 'snmp-v2',
+                               'tcp': 'tcp'},
+ 'fritz.box': {'address_family': 'ip-v4-only',
+               'agent': 'cmk-agent',
+               'criticality': 'prod',
+               'ip-v4': 'ip-v4',
+               'networking': 'lan',
+               'piggyback': 'auto-piggyback',
+               'site': 'realm',
+               'snmp_ds': 'no-snmp',
+               'tcp': 'tcp'},
+ 'switch.realm.local': {'address_family': 'ip-v4-only',
+                        'agent': 'no-agent',
+                        'criticality': 'prod',
+                        'ip-v4': 'ip-v4',
+                        'networking': 'lan',
+                        'piggyback': 'auto-piggyback',
+                        'ping': 'ping',
+                        'site': 'realm',
+                        'snmp_ds': 'no-snmp'},
+ 'syno.realm.local': {'address_family': 'ip-v4-only',
+                      'agent': 'no-agent',
+                      'criticality': 'prod',
+                      'ip-v4': 'ip-v4',
+                      'networking': 'lan',
+                      'piggyback': 'auto-piggyback',
+                      'site': 'realm',
+                      'snmp': 'snmp',
+                      'snmp_ds': 'snmp-v2'}})
 
 host_labels.update({})
 
 # Explicit IPv4 addresses
-ipaddresses.update({'epson-xp-8600.realm.local': '192.168.0.100', 'fritz.box': '192.168.0.1', 'switch.realm.local': '192.168.0.3', 'syno.realm.local': '192.168.0.40'})
+ipaddresses.update({'epson-xp-8600.realm.local': '192.168.0.100',
+ 'fritz.box': '192.168.0.1',
+ 'switch.realm.local': '192.168.0.3',
+ 'syno.realm.local': '192.168.0.40'})
 
 # Explicit SNMP communities
 explicit_snmp_communities.update({'epson-xp-8600.realm.local': 'realm.local', 'syno.realm.local': 'realm.local'})
 
 # Host attributes (needed for WATO)
 host_attributes.update(
-{'epson-xp-8600.realm.local': {'ipaddress': '192.168.0.100', 'snmp_community': 'realm.local', 'meta_data': {'created_at': 1625756176.0, 'created_by': 'caelebfi', 'updated_at': 1641453844.4523828}, 'tag_agent': 'special-agents', 'tag_snmp_ds': 'snmp-v2'}, 'fritz.box': {'meta_data': {'created_at': 1598007013.355116, 'created_by': 'cmkadmin', 'updated_at': 1641453844.453302}, 'ipaddress': '192.168.0.1'}, 'switch.realm.local': {'ipaddress': '192.168.0.3', 'tag_agent': 'no-agent', 'meta_data': {'created_at': 1634659066.8397715, 'updated_at': 1641453844.4539795, 'created_by': 'caelebfi'}}, 'syno.realm.local': {'ipaddress': '192.168.0.40', 'snmp_community': 'realm.local', 'meta_data': {'created_at': 1598008042.0, 'created_by': 'cmkadmin', 'updated_at': 1641453844.454704}, 'tag_agent': 'no-agent', 'tag_snmp_ds': 'snmp-v2'}})
+{'epson-xp-8600.realm.local': {'ipaddress': '192.168.0.100',
+                               'meta_data': {'created_at': 1625756176.0,
+                                             'created_by': 'caelebfi',
+                                             'updated_at': 1643015355.0786352},
+                               'snmp_community': 'realm.local',
+                               'tag_agent': 'special-agents',
+                               'tag_snmp_ds': 'snmp-v2'},
+ 'fritz.box': {'ipaddress': '192.168.0.1',
+               'meta_data': {'created_at': 1598007013.355116,
+                             'created_by': 'cmkadmin',
+                             'updated_at': 1643015355.0794458}},
+ 'switch.realm.local': {'ipaddress': '192.168.0.3',
+                        'meta_data': {'created_at': 1634659066.8397715,
+                                      'created_by': 'caelebfi',
+                                      'updated_at': 1643015355.0801435},
+                        'tag_agent': 'no-agent'},
+ 'syno.realm.local': {'ipaddress': '192.168.0.40',
+                      'meta_data': {'created_at': 1598008042.0,
+                                    'created_by': 'cmkadmin',
+                                    'updated_at': 1643015355.0809112},
+                      'snmp_community': 'realm.local',
+                      'tag_agent': 'no-agent',
+                      'tag_snmp_ds': 'snmp-v2'}})
diff --git a/multisite.d/wato/users.mk b/multisite.d/wato/users.mk
index ae32dca..ab7b1a9 100644
--- a/multisite.d/wato/users.mk
+++ b/multisite.d/wato/users.mk
@@ -1,3 +1,21 @@
 # Written by Checkmk store
 
-multisite_users.update({'cmkadmin': {'alias': 'cmkadmin', 'locked': False, 'roles': ['admin'], 'force_authuser': False, 'show_mode': 'default_show_more'}, 'caelebfi': {'alias': 'Gorden', 'locked': False, 'language': '', 'roles': ['user', 'admin'], 'force_authuser': False, 'show_mode': 'default_show_more', 'nav_hide_icons_title': None, 'icons_per_item': None}, 'automation': {'alias': 'Check_MK Automation - used for calling web services', 'locked': False, 'roles': ['admin'], 'language': 'en', 'automation_secret': '6e7c3539-37fc-4d19-85f0-2eac2d56cd6f', 'show_mode': 'default_show_more'}})
+multisite_users.update({'automation': {'alias': 'Check_MK Automation - used for calling web services',
+                'automation_secret': '6e7c3539-37fc-4d19-85f0-2eac2d56cd6f',
+                'language': 'en',
+                'locked': False,
+                'roles': ['admin'],
+                'show_mode': 'default_show_more'},
+ 'caelebfi': {'alias': 'Gorden',
+              'force_authuser': False,
+              'icons_per_item': None,
+              'language': '',
+              'locked': False,
+              'nav_hide_icons_title': None,
+              'roles': ['user', 'admin'],
+              'show_mode': 'default_show_more'},
+ 'cmkadmin': {'alias': 'cmkadmin',
+              'force_authuser': False,
+              'locked': False,
+              'roles': ['admin'],
+              'show_mode': 'default_show_more'}})