diff --git a/model/registry/cloud.yaml b/model/registry/cloud.yaml
index 695bf64719..2c669052e8 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 6909fe4ecb..0755d078af 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/oci.yaml b/model/registry/oci.yaml
index 24e0cb93f2..45e2838796 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: