diff --git a/etc/metadefs/compute-vtpm-hw.json b/etc/metadefs/compute-vtpm-hw.json
new file mode 100644
index 0000000000..0a4f060269
--- /dev/null
+++ b/etc/metadefs/compute-vtpm-hw.json
@@ -0,0 +1,31 @@
+{
+    "namespace": "OS::Compute::TPM",
+    "display_name": "TPM Options",
+    "description": "Configuration options for TPM",
+    "visibility": "public",
+    "protected": true,
+    "resource_type_associations": [
+        {
+            "name": "OS::Nova::Flavor",
+            "prefix": "hw:"
+        },
+        {
+            "name": "OS::Glance::Image",
+            "prefix": "hw_"
+        }
+    ],
+    "properties": {
+        "tpm_model": {
+            "title": "TPM model",
+            "description": "TPM model to use. Option CRB is only valid for TPM version 2.0. Defaults to TIS.",
+            "operators": ["<or>"],
+            "type": "string",
+            "enum": [
+                "TIS",
+                "CRB"
+            ],
+            "default": "TIS"
+        }
+    },
+    "objects": []
+}
diff --git a/etc/metadefs/compute-vtpm.json b/etc/metadefs/compute-vtpm.json
new file mode 100644
index 0000000000..22017d681b
--- /dev/null
+++ b/etc/metadefs/compute-vtpm.json
@@ -0,0 +1,38 @@
+{
+    "namespace": "OS::Compute::VTPM",
+    "display_name": "Emulated Virtual TPM",
+    "description": "Configuration options for Emulated Virtual TPM",
+    "visibility": "public",
+    "protected": true,
+    "resource_type_associations": [
+        {
+            "name": "OS::Nova::Flavor",
+            "prefix": "traits:"
+        },
+        {
+            "name": "OS::Glance::Image",
+            "prefix": "traits:"
+        }
+    ],
+    "properties": {
+        "COMPUTE_SECURITY_TPM_1_2": {
+            "title": "Virtual TPM Version 1.2 Support",
+            "description": "Enables virtual TPM version 1.2.",
+            "type": "string",
+            "enum": [
+                "required"
+            ],
+            "default": "required"
+        },
+        "COMPUTE_SECURITY_TPM_2_0": {
+            "title": "Virtual TPM Version 2.0 Support",
+            "description": "Enables virtual TPM version 2.0.",
+            "type": "string",
+            "enum": [
+                "required"
+            ],
+            "default": "required"
+        }
+    },
+    "objects": []
+}