diff --git a/etc/metadefs/compute-cpu-mode.json b/etc/metadefs/compute-cpu-mode.json
new file mode 100644
index 0000000000..5bbe1de910
--- /dev/null
+++ b/etc/metadefs/compute-cpu-mode.json
@@ -0,0 +1,29 @@
+{
+    "namespace": "OS::Compute::CPUMode",
+    "display_name": "CPU Mode",
+    "description": "This provides the preferred CPU Model to be used when booting up a guest VM.",
+    "visibility": "public",
+    "resource_type_associations": [
+        {
+            "name": "OS::Glance::Image",
+            "prefix": "hw_"
+        },
+        {
+            "name": "OS::Nova::Flavor",
+            "prefix": "hw:"
+        }
+    ],
+    "properties": {
+        "cpu_mode": {
+            "title": "CPU Mode",
+            "description": "Type of CPU Mode.",
+            "type": "string",
+            "enum": [
+              "none",
+              "host-model",
+              "host-passthrough",
+              "custom"
+            ]
+        }
+    }
+}
diff --git a/etc/metadefs/glance-common-image-props.json b/etc/metadefs/glance-common-image-props.json
index 74c251dbea..b2263a0cea 100644
--- a/etc/metadefs/glance-common-image-props.json
+++ b/etc/metadefs/glance-common-image-props.json
@@ -33,6 +33,11 @@
             "description": "The common name of the operating system distribution in lowercase (uses the same data vocabulary as the libosinfo project). Specify only a recognized value for this field. Deprecated values are listed to assist you in searching for the recognized value.",
             "type": "string"
         },
+        "hw_cpu_mode": {
+            "title": "CPU Mode",
+            "description": "This specifies the CPU Mode for the guest vm",
+            "type": "string"
+        },
         "os_version": {
             "title": "OS Version",
             "description": "Operating system version as specified by the distributor. (for example, '11.10')",