diff --git a/apertis-sample-image-development.yaml b/apertis-sample-image-development.yaml
index 8f5a62060e9024d490e9fb66ec79ca887f8e2017..dc6bfc0aa0eb587500193114c88a9d7cfdd73c06 100644
--- a/apertis-sample-image-development.yaml
+++ b/apertis-sample-image-development.yaml
@@ -3,7 +3,7 @@
 {{- $mirror := "https://repositories.apertis.org/apertis/" }}
 {{- $suite := "18.12" }}
 {{- $timestamp := "00000000.0" }}
-{{- $image := (printf "apertis-sample-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{- $image := (printf "apertis-sample-development-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
 
 architecture: {{ $architecture }}
 
diff --git a/apertis-sample-image-production.yaml b/apertis-sample-image-production.yaml
index ba0be8505767d85d5490480fe10d7d1fc7c1f83c..95f24294b245e1e190842dfd80416d47131f6799 100644
--- a/apertis-sample-image-production.yaml
+++ b/apertis-sample-image-production.yaml
@@ -3,7 +3,7 @@
 {{- $mirror := "https://repositories.apertis.org/apertis/" }}
 {{- $suite := "18.12" }}
 {{- $timestamp := "00000000.0" }}
-{{- $image := (printf "apertis-sample-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{- $image := (printf "apertis-sample-production-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
 
 {{ $board := "uboot" }}
 {{ $osname := "apertis" }}
diff --git a/apertis-sample-image-sdk.yaml b/apertis-sample-image-sdk.yaml
index 994d1b35f33ac8884d158c7870cb1a6103924ad2..1321f647d69235823498e6c52bda26696e778cf7 100644
--- a/apertis-sample-image-sdk.yaml
+++ b/apertis-sample-image-sdk.yaml
@@ -3,7 +3,7 @@
 {{- $mirror := "https://repositories.apertis.org/apertis/" }}
 {{- $suite := "18.12" }}
 {{- $timestamp := "00000000.0" }}
-{{- $image := (printf "apertis-sample-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+{{- $image := (printf "apertis-sample-sdk-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
 
 {{ $devroot_arch := "armhf" }}
 {{ $devpack := (printf "ospack_%s-%s-%s_%s" $suite $devroot_arch "devroot" $timestamp) }}