diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 6356384028e1245cfe47f55824b056f155fff807..399ff4f06a08297bdf3acce3c9b2998aca90a3c7 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index af34d9b74e8aead8a427fcd47a21bb60db0cd803..71d7a1fa2087d8c169f516092ac79e65f3970a1d 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index af1339a60e31570798190bc806c8dff1e9333d27..ab84eeb0ec4f54659b83e4d6328e011a10998918 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index 1e995c2298bc1608509549505f8ecdae438c688e..89ee9dbb5458d251948a00aec3507466687351ce 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 7e8636783b8596e5ec10e9203f8f7b34ab3f92f9..918d9a037fccc6d946974db1a73c2b4a417fb7d9 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index 620177b6b51286d1ae689918012a5a7ae89c9526..a7cfeb63ef0864909390a97a08f3756a04aaec9f 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -15,6 +15,12 @@
         "password_prompt": "Password:",
         "password": "user",
         "login_commands": [ "sudo su" ]
+      },
+      "metadata": {
+        "image.version": "{{image_date}}",
+        "image.release": "{{release_version}}",
+        "image.board": "{{board}}",
+        "image.type": "{{image_type}}"
       }
     },
     {