diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index b31a5eb6db74a49ce9f1c0259b0f39757c13dba7..59d1a5648b36588b7c8a9dd47d34cbe6ff8fb833 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index ec0efd94e9020256b1fe246bdd7ae992f031baea..3e61ca48696e37c8f4e7d7f884844bdbf634256e 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index dc042ee6fdaf0c0d912297d7ec6db987da0d016b..c6ac9f7505348a5fe51d9efac740631b1dde3a51 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index fdaa3153cf201f66a2839b59a115bd4a2bd4b991..cc33b078374a74dbea307b407f7ec3ab5d72b500 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ospack-sysroot.yaml b/apertis-ospack-sysroot.yaml
index ec0efd94e9020256b1fe246bdd7ae992f031baea..3e61ca48696e37c8f4e7d7f884844bdbf634256e 100644
--- a/apertis-ospack-sysroot.yaml
+++ b/apertis-ospack-sysroot.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 4b1a79fbefa6fe93f1fd6436fab918d7a6e08e0f..b47a1a660279528dfaa2d54abba68046be05a44b 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -24,7 +24,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/scripts/setup_image_version.sh b/scripts/setup_image_version.sh
index 467089d0cbeaab173d36247eccec69bb9edb0cc9..3bb6e0314fa7f4c2c1a1dc548ba4591516dc46b4 100755
--- a/scripts/setup_image_version.sh
+++ b/scripts/setup_image_version.sh
@@ -6,5 +6,11 @@ distro=$1
 rel=$2
 timestamp=$3
 vendor=$4
+variant=$5
 
 echo "${distro} ${rel} ${timestamp} ${vendor}" > /etc/image_version
+
+if [ -n "$variant" ]; then
+    echo "VARIANT_ID=$variant" >> /etc/os-release
+fi
+echo "BUILD_ID=$timestamp" >> /etc/os-release