diff --git a/simple-kiwi-build b/simple-kiwi-build
index 7c0630f..3a1e49a 100755
--- a/simple-kiwi-build
+++ b/simple-kiwi-build
@@ -16,12 +16,14 @@ case "${image_profile}" in
 esac
 
 case "${image_profile}" in
-    *Live*) image_type="iso" ;;
-    *     ) image_type="oem" ;;
+    *Live*)      image_type="iso" ;;
+    *Container*) image_type="oci" ;;
+    *     )      image_type="oem" ;;
 esac
 
+commit="$(git rev-parse --short=12 HEAD)"
 today="$(date '+%Y%m%d')"
-outdir="${today}-${image_profile}"
+outdir="${today}-${image_profile}-${commit}"
 
 rm -rf "${outdir}-build" "${outdir}"
 
@@ -30,7 +32,7 @@ rm -rf "${outdir}-build" "${outdir}"
     --kiwi-file="${kiwi_file}" \
     --image-type="${image_type}" \
     --image-profile="${image_profile}" \
-    --image-release="${today}" \
+    --image-release="${today}-${commmit}" \
     "$@"
 
 rm -rf "${outdir}-build"