diff --git a/conf.d/wato/container/.wato b/conf.d/wato/container/.wato
index 1f970fc..f72ee80 100644
--- a/conf.d/wato/container/.wato
+++ b/conf.d/wato/container/.wato
@@ -1 +1 @@
-{'title': 'container', 'attributes': {'meta_data': {'created_at': 1648476986.2041843, 'updated_at': 1649045114.225705, 'created_by': 'caelebfi'}}, 'num_hosts': 8, 'lock': False, 'lock_subfolders': False, '__id': '8eda6a9d582a4f4aab0e57cb3d49d695'}
+{'title': 'container', 'attributes': {'meta_data': {'created_at': 1648476986.0, 'created_by': 'caelebfi', 'updated_at': 1649060542.5227098}, 'tag_architecture': 'container'}, 'num_hosts': 8, 'lock': False, 'lock_subfolders': False, '__id': '8eda6a9d582a4f4aab0e57cb3d49d695'}
diff --git a/conf.d/wato/container/hosts.mk b/conf.d/wato/container/hosts.mk
index 563f463..9aef397 100644
--- a/conf.d/wato/container/hosts.mk
+++ b/conf.d/wato/container/hosts.mk
@@ -12,7 +12,7 @@ all_hosts += ['darkstat',
 
 host_tags.update({'darkstat': {'address_family': 'no-ip',
               'agent': 'no-agent',
-              'architecture': 'raspi',
+              'architecture': 'container',
               'criticality': 'prod',
               'networking': 'lan',
               'os': 'linux',
@@ -21,7 +21,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
               'snmp_ds': 'no-snmp'},
  'grafana': {'address_family': 'no-ip',
              'agent': 'no-agent',
-             'architecture': 'raspi',
+             'architecture': 'container',
              'criticality': 'prod',
              'networking': 'lan',
              'os': 'linux',
@@ -30,7 +30,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
              'snmp_ds': 'no-snmp'},
  'influxdb': {'address_family': 'no-ip',
               'agent': 'no-agent',
-              'architecture': 'raspi',
+              'architecture': 'container',
               'criticality': 'prod',
               'networking': 'lan',
               'os': 'linux',
@@ -39,7 +39,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
               'snmp_ds': 'no-snmp'},
  'openhab': {'address_family': 'no-ip',
              'agent': 'no-agent',
-             'architecture': 'raspi',
+             'architecture': 'container',
              'criticality': 'prod',
              'networking': 'lan',
              'os': 'linux',
@@ -48,7 +48,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
              'snmp_ds': 'no-snmp'},
  'photoprism_photoprism_1': {'address_family': 'no-ip',
                              'agent': 'no-agent',
-                             'architecture': 'raspi',
+                             'architecture': 'container',
                              'criticality': 'prod',
                              'networking': 'lan',
                              'os': 'linux',
@@ -57,7 +57,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
                              'snmp_ds': 'no-snmp'},
  'portainer': {'address_family': 'no-ip',
                'agent': 'no-agent',
-               'architecture': 'raspi',
+               'architecture': 'container',
                'criticality': 'prod',
                'networking': 'lan',
                'os': 'linux',
@@ -66,7 +66,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
                'snmp_ds': 'no-snmp'},
  'telegraf': {'address_family': 'no-ip',
               'agent': 'no-agent',
-              'architecture': 'raspi',
+              'architecture': 'container',
               'criticality': 'prod',
               'networking': 'lan',
               'os': 'linux',
@@ -75,7 +75,7 @@ host_tags.update({'darkstat': {'address_family': 'no-ip',
               'snmp_ds': 'no-snmp'},
  'watchtowercontinuously': {'address_family': 'no-ip',
                             'agent': 'no-agent',
-                            'architecture': 'raspi',
+                            'architecture': 'container',
                             'criticality': 'prod',
                             'networking': 'lan',
                             'os': 'linux',
@@ -95,7 +95,7 @@ host_attributes.update(
               'locked_by': ['realm', 'dcd', 'connection_1'],
               'meta_data': {'created_at': 1648539567.929491,
                             'created_by': 'automation',
-                            'updated_at': 1649060529.4484463},
+                            'updated_at': 1649060542.5308096},
               'site': 'realm',
               'tag_address_family': 'no-ip',
               'tag_agent': 'no-agent',
@@ -109,7 +109,7 @@ host_attributes.update(
              'locked_by': ['realm', 'dcd', 'connection_1'],
              'meta_data': {'created_at': 1648539568.2703123,
                            'created_by': 'automation',
-                           'updated_at': 1649060529.4498894},
+                           'updated_at': 1649060542.5318558},
              'site': 'realm',
              'tag_address_family': 'no-ip',
              'tag_agent': 'no-agent',
@@ -123,7 +123,7 @@ host_attributes.update(
               'locked_by': ['realm', 'dcd', 'connection_1'],
               'meta_data': {'created_at': 1649045113.8264816,
                             'created_by': 'automation',
-                            'updated_at': 1649060529.4506364},
+                            'updated_at': 1649060542.532615},
               'site': 'realm',
               'tag_address_family': 'no-ip',
               'tag_agent': 'no-agent',
@@ -137,7 +137,7 @@ host_attributes.update(
              'locked_by': ['realm', 'dcd', 'connection_1'],
              'meta_data': {'created_at': 1649045114.0838118,
                            'created_by': 'automation',
-                           'updated_at': 1649060529.451349},
+                           'updated_at': 1649060542.5333457},
              'site': 'realm',
              'tag_address_family': 'no-ip',
              'tag_agent': 'no-agent',
@@ -151,7 +151,7 @@ host_attributes.update(
                              'locked_by': ['realm', 'dcd', 'connection_1'],
                              'meta_data': {'created_at': 1648539568.5926287,
                                            'created_by': 'automation',
-                                           'updated_at': 1649060529.4522038},
+                                           'updated_at': 1649060542.534066},
                              'site': 'realm',
                              'tag_address_family': 'no-ip',
                              'tag_agent': 'no-agent',
@@ -165,7 +165,7 @@ host_attributes.update(
                'locked_by': ['realm', 'dcd', 'connection_1'],
                'meta_data': {'created_at': 1649045114.191512,
                              'created_by': 'automation',
-                             'updated_at': 1649060529.4534166},
+                             'updated_at': 1649060542.5347779},
                'site': 'realm',
                'tag_address_family': 'no-ip',
                'tag_agent': 'no-agent',
@@ -179,7 +179,7 @@ host_attributes.update(
               'locked_by': ['realm', 'dcd', 'connection_1'],
               'meta_data': {'created_at': 1648539568.856807,
                             'created_by': 'automation',
-                            'updated_at': 1649060529.4541552},
+                            'updated_at': 1649060542.5355504},
               'site': 'realm',
               'tag_address_family': 'no-ip',
               'tag_agent': 'no-agent',
@@ -193,7 +193,7 @@ host_attributes.update(
                             'locked_by': ['realm', 'dcd', 'connection_1'],
                             'meta_data': {'created_at': 1648539569.0012856,
                                           'created_by': 'automation',
-                                          'updated_at': 1649060529.4548614},
+                                          'updated_at': 1649060542.5363677},
                             'site': 'realm',
                             'tag_address_family': 'no-ip',
                             'tag_agent': 'no-agent',