diff --git a/apertis-sample-image-mx6qsabrelite.yaml b/apertis-sample-image-development.yaml
similarity index 98%
rename from apertis-sample-image-mx6qsabrelite.yaml
rename to apertis-sample-image-development.yaml
index 9dd74e5f80f13c01bb82ece0917a3ecfae185960..8f5a62060e9024d490e9fb66ec79ca887f8e2017 100644
--- a/apertis-sample-image-mx6qsabrelite.yaml
+++ b/apertis-sample-image-development.yaml
@@ -17,7 +17,7 @@ actions:
       suite: {{ $suite }}
       timestamp: {{ $timestamp }}
 
-  # Create the MX6 SabreLite image based on rootfs created during previous action 
+  # Create the MX6 SabreLite image based on rootfs created during previous action
   - action: recipe
     description: Create image {{ $image }} for {{ $suite }} {{ $type }} {{ $architecture }}
     recipe: apertis-image-mx6qsabrelite.yaml
diff --git a/apertis-sample-image-ostree-uboot.yaml b/apertis-sample-image-production.yaml
similarity index 99%
rename from apertis-sample-image-ostree-uboot.yaml
rename to apertis-sample-image-production.yaml
index 453044d4594a9226ebee791619039b0b74d607a1..ba0be8505767d85d5490480fe10d7d1fc7c1f83c 100644
--- a/apertis-sample-image-ostree-uboot.yaml
+++ b/apertis-sample-image-production.yaml
@@ -47,7 +47,7 @@ actions:
     chroot: false
     command: find ${ROOTDIR} -maxdepth 1 -mindepth 1 -exec rm -rf {} \;
 
-  # Create the U-Boot image based on OSTree rootfs created during previous action 
+  # Create the U-Boot image based on OSTree rootfs created during previous action
   - action: recipe
     description: Create image {{ $image }} for {{ $suite }} {{ $type }} {{ $architecture }}
     recipe: apertis-ostree-image-uboot.yaml
diff --git a/apertis-sample-image-basesdk.yaml b/apertis-sample-image-sdk.yaml
similarity index 100%
rename from apertis-sample-image-basesdk.yaml
rename to apertis-sample-image-sdk.yaml