diff --git a/model/registry/cloud.yaml b/model/registry/cloud.yaml
index 695bf6471..2c669052e 100644
--- a/model/registry/cloud.yaml
+++ b/model/registry/cloud.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.cloud
     prefix: cloud
-    type: attribute_group
+    type: resource
     brief: >
       A cloud environment (e.g. GCP, Azure, AWS).
     attributes:
diff --git a/model/registry/container.yaml b/model/registry/container.yaml
index 6909fe4ec..0755d078a 100644
--- a/model/registry/container.yaml
+++ b/model/registry/container.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.container
     prefix: container
-    type: attribute_group
+    type: resource
     brief: >
       A container instance.
     attributes:
diff --git a/model/registry/device.yaml b/model/registry/device.yaml
index c109981f1..6eaf8e3b5 100644
--- a/model/registry/device.yaml
+++ b/model/registry/device.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.device
     prefix: device
-    type: attribute_group
+    type: resource
     brief: >
         Describes device attributes.
     attributes:
diff --git a/model/registry/host.yaml b/model/registry/host.yaml
index fed665548..3deb5f570 100644
--- a/model/registry/host.yaml
+++ b/model/registry/host.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.host
     prefix: host
-    type: attribute_group
+    type: resource
     brief: >
       A host is defined as a computing instance. For example, physical servers, virtual machines, switches or disk array.
     attributes:
diff --git a/model/registry/oci.yaml b/model/registry/oci.yaml
index 24e0cb93f..45e283879 100644
--- a/model/registry/oci.yaml
+++ b/model/registry/oci.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.oci.manifest
     prefix: oci.manifest
-    type: attribute_group
+    type: resource
     brief: >
       An OCI image manifest.
     attributes:
diff --git a/model/registry/os.yaml b/model/registry/os.yaml
index af8dbfcd2..5b699b1fa 100644
--- a/model/registry/os.yaml
+++ b/model/registry/os.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.os
     prefix: os
-    type: attribute_group
+    type: resource
     brief: >
         The operating system (OS) on which the process represented by this resource is running.
     note: >
diff --git a/model/registry/process.yaml b/model/registry/process.yaml
index f85a94f56..dd26c09b7 100644
--- a/model/registry/process.yaml
+++ b/model/registry/process.yaml
@@ -1,7 +1,7 @@
 groups:
   - id: registry.process
     prefix: process
-    type: attribute_group
+    type: resource
     brief: >
         An operating system process.
     attributes: