diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6bbeaa92..60b865e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Enhancements
 * [artifact-manager] IAC-786 / Set Aria Operations Default Policy vROPs 8.12.x.
 * [artifact-manager] IAC-790 / Update usage of deprecated policy APIs for vROPs 8.12.x.
+* [archetypes] IAC-797 / Improved content.yaml definition for "ts-vra-ng" and "vra-ng"
 
 ### Bugs
 * [o11n-plugin-ssh] session esxiCode returns type void() instead of number
diff --git a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
index 6251482eb..f4183ae7f 100644
--- a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
+++ b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
@@ -27,7 +27,8 @@
 #     - policy name 2
 
 blueprint:
-subscription:
+  - Volume
+subscription: []
 flavor-mapping:
   - small
   - medium
@@ -37,11 +38,13 @@ region-mapping:
   cloud-account-tags:
     export-tag: "env:dev"
     import-tags: ["env:dev", "env:test"]
-catalog-item:
-custom-resource:
-resource-action:
-catalog-entitlement:
-content-source:
-property-group:
+catalog-item: []
+custom-resource: []
+resource-action: []
+catalog-entitlement: []
+
+property-group: []
 policy:
-  content-sharing:
+  content-sharing: []
+
+content-source: []
diff --git a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
index 6251482eb..f4183ae7f 100644
--- a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
+++ b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
@@ -27,7 +27,8 @@
 #     - policy name 2
 
 blueprint:
-subscription:
+  - Volume
+subscription: []
 flavor-mapping:
   - small
   - medium
@@ -37,11 +38,13 @@ region-mapping:
   cloud-account-tags:
     export-tag: "env:dev"
     import-tags: ["env:dev", "env:test"]
-catalog-item:
-custom-resource:
-resource-action:
-catalog-entitlement:
-content-source:
-property-group:
+catalog-item: []
+custom-resource: []
+resource-action: []
+catalog-entitlement: []
+
+property-group: []
 policy:
-  content-sharing:
+  content-sharing: []
+
+content-source: []