diff --git a/apertis-image-sdk.yaml b/apertis-image-sdk.yaml
index e265a41b5ff3b5063f8a08077c6dcc105d0387c8..2728b4e25a7ff7038e18aad7c972d77f4b5e0296 100644
--- a/apertis-image-sdk.yaml
+++ b/apertis-image-sdk.yaml
@@ -2,9 +2,9 @@
 {{ $type := or .type "sdk" }}
 {{ $mirror := or .mirror "https://repositories.apertis.org/apertis/" }}
 {{ $suite := or .suite "v2019dev0" }}
-{{ $timestamp := or .timestamp "00000000.0" }}
-{{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{ $timestamp := or .timestamp "" }}
+{{ $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) }}
+{{ $image := or .image (printf "apertis-%s-%s-%s" $suite  $type $architecture) }}
 
 {{ $cmdline := or .cmdline "console=tty0 console=ttyS0,115200n8 rootwait ro quiet splash plymouth.ignore-serial-consoles fsck.mode=auto fsck.repair=yes" }}
 
diff --git a/apertis-image-uboot.yaml b/apertis-image-uboot.yaml
index 08deeda88d8522517cc2241fd986954cfc1033b0..7bc9e0f6b73315fcda115da13fc757bd8ac99ab4 100644
--- a/apertis-image-uboot.yaml
+++ b/apertis-image-uboot.yaml
@@ -2,9 +2,9 @@
 {{ $type := or .type "minimal" }}
 {{ $mirror := or .mirror "https://repositories.apertis.org/apertis/" }}
 {{ $suite := or .suite "v2019dev0" }}
-{{ $timestamp := or .timestamp "00000000.0" }}
-{{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{ $timestamp := or .timestamp "" }}
+{{ $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) }}
+{{ $image := or .image (printf "apertis-%s-%s-%s" $suite  $type $architecture) }}
 
 {{ $cmdline := or .cmdline " rootwait ro fsck.mode=auto fsck.repair=yes" }}
 
diff --git a/apertis-image-uefi.yaml b/apertis-image-uefi.yaml
index 7d4ad2d2cffbb8a18b1fb5bab2dacb5ab7697f56..52cea9766065682d3a79ebd7dcdecea7c26cec1f 100644
--- a/apertis-image-uefi.yaml
+++ b/apertis-image-uefi.yaml
@@ -2,9 +2,9 @@
 {{ $type := or .type "minimal" }}
 {{ $mirror := or .mirror "https://repositories.apertis.org/apertis/" }}
 {{ $suite := or .suite "v2019dev0" }}
-{{ $timestamp := or .timestamp "00000000.0" }}
-{{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{ $timestamp := or .timestamp "" }}
+{{ $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) }}
+{{ $image := or .image (printf "apertis-%s-%s-%s" $suite  $type $architecture) }}
 
 {{ $cmdline := or .cmdline "console=tty0 console=ttyS0,115200n8 rootwait ro quiet splash plymouth.ignore-serial-consoles fsck.mode=auto fsck.repair=yes" }}
 
diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 354f0c70413315583fb08a43ab729f91d5cdf6f3..c1d6d1f2cc3916e1203a40694f48f5e4201a29e4 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "basesdk" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 
 architecture: {{ $architecture }}
 
@@ -22,7 +22,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
+    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 cf2a37ae636fba9df1b236c440121fee6828e379..ba91f8737822bc06bc1e72a857e246f3a09ed337 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "devroot" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 {{- $ivitools := or .ivitools "enabled" -}}
 {{- $lxc := or .lxc "enabled" -}}
 
@@ -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 {{ $type }}
+    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 a5c458da2c3eb9c883bd8ed0155a214ba17b6219..c167a325873c112ec2234cc84256594bb0aabaff 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "minimal" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 {{- $lxc := or .lxc "enabled" -}}
 
 architecture: {{ $architecture }}
@@ -23,7 +23,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
+    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 4d146fd4d3d48d90d74981cca5a2e15fd21c36a2..931e12a933c1fc1af7ed68dab9530a92101edab8 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "sdk" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 {{- $lxc := or .lxc "enabled" -}}
 
 architecture: {{ $architecture }}
@@ -23,7 +23,7 @@ actions:
   - action: run
     description: "Setting up image version metadata"
     chroot: true
-    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora {{ $type }}
+    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 4996a3545f4b28a0c60ffba772b44cc413a928f1..409ada7dbe23150aa8dd76049e3d96be62c15d55 100644
--- a/apertis-ospack-sysroot.yaml
+++ b/apertis-ospack-sysroot.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "sysroot" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 {{- $ivitools := or .ivitools "enabled" -}}
 {{- $lxc := or .lxc "enabled" -}}
 
@@ -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 {{ $type }}
+    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 b7513960356b7cce106a8324a335a0bbf089ffec..ffc7a8b1f87d865382c991ae4ce18ef8ae253996 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -2,8 +2,8 @@
 {{- $type := or .type "target" -}}
 {{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
 {{- $suite := or .suite "v2019dev0" -}}
-{{- $timestamp := or .timestamp "00000000.0" -}}
-{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $timestamp := or .timestamp "" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) -}}
 {{- $ivitools := or .ivitools "disabled" -}}
 {{- $lxc := or .lxc "disabled" -}}
 
@@ -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 {{ $type }}
+    script: scripts/setup_image_version.sh apertis {{ $suite }} '{{ $timestamp }}' collabora {{ $type }}
 
   # Extend apt sources list
   - action: run
diff --git a/apertis-ostree-commit.yaml b/apertis-ostree-commit.yaml
index d154ef5b79dd1a68c59a9ed9de8479b6d8b674c3..af58f02d27fb8309472d8665a7acee95125da1ce 100644
--- a/apertis-ostree-commit.yaml
+++ b/apertis-ostree-commit.yaml
@@ -1,8 +1,8 @@
 {{ $architecture := or .architecture "amd64" }}
 {{ $type := or .type "minimal" }}
 {{ $suite := or .suite "v2019dev0" }}
-{{ $timestamp := or .timestamp "00000000.0" }}
-{{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) }}
+{{ $timestamp := or .timestamp "" }}
+{{ $ospack := or .ospack (printf "ospack_%s-%s-%s" $suite $architecture $type) }}
 
 {{ $board := or .board "uefi" }}
 {{ $branch := or .branch (printf "apertis/%s/%s-%s/%s" $suite $architecture $board $type) }}
diff --git a/scripts/setup_image_version.sh b/scripts/setup_image_version.sh
index 3bb6e0314fa7f4c2c1a1dc548ba4591516dc46b4..c4cf46e8fc7752ab2e69bd865de9c2ed0d755744 100755
--- a/scripts/setup_image_version.sh
+++ b/scripts/setup_image_version.sh
@@ -13,4 +13,6 @@ 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
+if [ -n "$timestamp" ]; then
+    echo "BUILD_ID=$timestamp" >> /etc/os-release
+fi