diff --git a/etc/metadefs/software-databases.json b/etc/metadefs/software-databases.json
index 213c1bdf46..fcbf5d9d73 100644
--- a/etc/metadefs/software-databases.json
+++ b/etc/metadefs/software-databases.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         },
         {
             "name": "OS::Trove::Instance"
diff --git a/etc/metadefs/software-runtimes.json b/etc/metadefs/software-runtimes.json
index 67c5235334..244ae3e41b 100644
--- a/etc/metadefs/software-runtimes.json
+++ b/etc/metadefs/software-runtimes.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         }
     ],
     "objects": [
@@ -73,4 +74,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/etc/metadefs/software-webservers.json b/etc/metadefs/software-webservers.json
index ac0cc84825..b626c74b20 100644
--- a/etc/metadefs/software-webservers.json
+++ b/etc/metadefs/software-webservers.json
@@ -13,7 +13,8 @@
             "properties_target": "image"
         },
         {
-            "name": "OS::Nova::Instance"
+            "name": "OS::Nova::Instance",
+            "properties_target": "metadata"
         }
     ],
     "objects": [
@@ -99,4 +100,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}