From 2f63c026861ab6ebcfdbd73ce99375353bfd3a5a Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Fri, 8 Feb 2013 19:16:00 +0100
Subject: [PATCH] [molecules] migrate hardcoded release version to
 SABAYON_RELEASE env var

---
 molecules/sabayon-amd64+x86-gnome.spec        |  8 +--
 molecules/sabayon-amd64+x86-kde.spec          |  6 +-
 molecules/sabayon-amd64-awesome.spec          |  4 +-
 molecules/sabayon-amd64-corecdx.spec          |  4 +-
 molecules/sabayon-amd64-e17.spec              |  4 +-
 molecules/sabayon-amd64-gaming.spec           |  4 +-
 molecules/sabayon-amd64-gnome.spec            |  4 +-
 molecules/sabayon-amd64-hardenedserver.spec   |  4 +-
 molecules/sabayon-amd64-kde.spec              |  4 +-
 molecules/sabayon-amd64-lxde.spec             |  4 +-
 molecules/sabayon-amd64-mate.spec             |  4 +-
 molecules/sabayon-amd64-serverbase.spec       |  4 +-
 ...on-amd64-spinbase-amazon-ami-template.spec |  4 +-
 ...bayon-amd64-spinbase-amazon-ebs-image.spec |  4 +-
 ...abayon-amd64-spinbase-openvz-template.spec |  4 +-
 molecules/sabayon-amd64-spinbase.spec         |  4 +-
 molecules/sabayon-amd64-xfce.spec             |  4 +-
 molecules/sabayon-amd64-xfceforensic.spec     |  2 +-
 molecules/sabayon-arm-beagleboard-xm-4G.spec  |  4 +-
 molecules/sabayon-arm-beagleboard-xm-8G.spec  |  4 +-
 molecules/sabayon-arm-beaglebone-base-2G.spec |  4 +-
 molecules/sabayon-arm-beaglebone-base-4G.spec |  4 +-
 molecules/sabayon-arm-efikamx-4G.spec         |  4 +-
 molecules/sabayon-arm-efikamx-base-4G.spec    |  4 +-
 molecules/sabayon-arm-pandaboard-4G.spec      |  4 +-
 molecules/sabayon-arm-pandaboard-8G.spec      |  4 +-
 .../sabayon-armel-beagleboard-xm-4G.spec      |  4 +-
 .../sabayon-armel-beagleboard-xm-8G.spec      |  4 +-
 .../sabayon-armel-beaglebone-base-2G.spec     |  4 +-
 .../sabayon-armel-beaglebone-base-4G.spec     |  4 +-
 molecules/sabayon-armel-pandaboard-4G.spec    |  4 +-
 molecules/sabayon-armel-pandaboard-8G.spec    |  4 +-
 molecules/sabayon-x86-awesome.spec            |  4 +-
 molecules/sabayon-x86-corecdx.spec            |  4 +-
 molecules/sabayon-x86-e17.spec                |  4 +-
 molecules/sabayon-x86-gaming.spec             |  4 +-
 molecules/sabayon-x86-gnome.spec              |  4 +-
 molecules/sabayon-x86-hardenedserver.spec     |  4 +-
 molecules/sabayon-x86-kde.spec                |  4 +-
 molecules/sabayon-x86-lxde.spec               |  4 +-
 molecules/sabayon-x86-mate.spec               |  4 +-
 molecules/sabayon-x86-serverbase.spec         |  4 +-
 ...ayon-x86-spinbase-amazon-ami-template.spec |  4 +-
 ...sabayon-x86-spinbase-amazon-ebs-image.spec |  4 +-
 .../sabayon-x86-spinbase-openvz-template.spec |  4 +-
 molecules/sabayon-x86-spinbase.spec           |  4 +-
 molecules/sabayon-x86-xfce.spec               |  4 +-
 molecules/sabayon-x86-xfceforensic.spec       |  2 +-
 scripts/amd64_x86_pre_iso_script.sh           |  2 +-
 scripts/generic_pre_iso_script.sh             |  2 +-
 scripts/iso_build.sh                          | 60 +++++++------------
 scripts/spinbase_pre_iso_script.sh            |  2 +-
 52 files changed, 121 insertions(+), 139 deletions(-)

diff --git a/molecules/sabayon-amd64+x86-gnome.spec b/molecules/sabayon-amd64+x86-gnome.spec
index 3717215..c2f4ea9 100644
--- a/molecules/sabayon-amd64+x86-gnome.spec
+++ b/molecules/sabayon-amd64+x86-gnome.spec
@@ -33,7 +33,7 @@ iso_title: Sabayon GNOME
 extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform efi -eltorito-boot boot/grub/efi.img
 
 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example
-%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_11_x86_G.iso
+%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_G.iso
 
 # Post-ISO building script, called after ISO image generation.    
 %env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
@@ -64,13 +64,13 @@ execute_repositories_update: no
 # paths_to_empty:
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64+x86 GNOME
 
 # Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_11_amd64_G.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_G.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64+x86_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64+x86_G.iso
diff --git a/molecules/sabayon-amd64+x86-kde.spec b/molecules/sabayon-amd64+x86-kde.spec
index 61d1f2b..f2418c8 100644
--- a/molecules/sabayon-amd64+x86-kde.spec
+++ b/molecules/sabayon-amd64+x86-kde.spec
@@ -64,13 +64,13 @@ execute_repositories_update: no
 # paths_to_empty:
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64+x86 KDE
 
 # Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_11_amd64_K.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_K.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64+x86_K.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64+x86_K.iso
diff --git a/molecules/sabayon-amd64-awesome.spec b/molecules/sabayon-amd64-awesome.spec
index a841fbf..712d823 100644
--- a/molecules/sabayon-amd64-awesome.spec
+++ b/molecules/sabayon-amd64-awesome.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/awesome.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 Awesome
@@ -11,4 +11,4 @@ release_desc: amd64 Awesome
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_Awesome.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_Awesome.iso
diff --git a/molecules/sabayon-amd64-corecdx.spec b/molecules/sabayon-amd64-corecdx.spec
index 720252c..861c975 100644
--- a/molecules/sabayon-amd64-corecdx.spec
+++ b/molecules/sabayon-amd64-corecdx.spec
@@ -1,11 +1,11 @@
 # Use abs path, otherwise daily iso build won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: amd64 CoreCDX
 
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_CoreCDX_11_amd64.iso
+%env destination_iso_image_name: Sabayon_Linux_CoreCDX_${SABAYON_RELEASE:-11}_amd64.iso
diff --git a/molecules/sabayon-amd64-e17.spec b/molecules/sabayon-amd64-e17.spec
index 20ddc1b..31e35e7 100644
--- a/molecules/sabayon-amd64-e17.spec
+++ b/molecules/sabayon-amd64-e17.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/e17.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 E17
@@ -11,4 +11,4 @@ release_desc: amd64 E17
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_E17.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_E17.iso
diff --git a/molecules/sabayon-amd64-gaming.spec b/molecules/sabayon-amd64-gaming.spec
index d244f22..db8fbab 100644
--- a/molecules/sabayon-amd64-gaming.spec
+++ b/molecules/sabayon-amd64-gaming.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gaming.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 Gaming Edition
@@ -11,4 +11,4 @@ release_desc: amd64 Gaming Edition
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_amd64_G.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_Gaming.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_Gaming.iso
diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec
index d0999cf..3e98a1c 100644
--- a/molecules/sabayon-amd64-gnome.spec
+++ b/molecules/sabayon-amd64-gnome.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 GNOME
@@ -11,4 +11,4 @@ release_desc: amd64 GNOME
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_G.iso
diff --git a/molecules/sabayon-amd64-hardenedserver.spec b/molecules/sabayon-amd64-hardenedserver.spec
index aa8b388..7d98509 100644
--- a/molecules/sabayon-amd64-hardenedserver.spec
+++ b/molecules/sabayon-amd64-hardenedserver.spec
@@ -1,11 +1,11 @@
 # Use abs path, otherwise daily iso build won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/hardenedserver.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: amd64 Hardened Server
 
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_HardenedServer_11_amd64.iso
+%env destination_iso_image_name: Sabayon_Linux_HardenedServer_${SABAYON_RELEASE:-11}_amd64.iso
diff --git a/molecules/sabayon-amd64-kde.spec b/molecules/sabayon-amd64-kde.spec
index 100d170..78e9c6b 100644
--- a/molecules/sabayon-amd64-kde.spec
+++ b/molecules/sabayon-amd64-kde.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/kde.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 KDE
@@ -11,4 +11,4 @@ release_desc: amd64 KDE
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_K.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_K.iso
diff --git a/molecules/sabayon-amd64-lxde.spec b/molecules/sabayon-amd64-lxde.spec
index ce1beef..dce6a23 100644
--- a/molecules/sabayon-amd64-lxde.spec
+++ b/molecules/sabayon-amd64-lxde.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxde.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 LXDE
@@ -11,4 +11,4 @@ release_desc: amd64 LXDE
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_LXDE.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_LXDE.iso
diff --git a/molecules/sabayon-amd64-mate.spec b/molecules/sabayon-amd64-mate.spec
index afa13ae..c21396e 100644
--- a/molecules/sabayon-amd64-mate.spec
+++ b/molecules/sabayon-amd64-mate.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/mate.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 MATE
@@ -11,4 +11,4 @@ release_desc: amd64 MATE
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_MATE.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_MATE.iso
diff --git a/molecules/sabayon-amd64-serverbase.spec b/molecules/sabayon-amd64-serverbase.spec
index 23b0889..2d719ce 100644
--- a/molecules/sabayon-amd64-serverbase.spec
+++ b/molecules/sabayon-amd64-serverbase.spec
@@ -1,11 +1,11 @@
 # Use abs path, otherwise daily iso build won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/serverbase.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: amd64 ServerBase
 
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_ServerBase_11_amd64.iso
+%env destination_iso_image_name: Sabayon_Linux_ServerBase_${SABAYON_RELEASE:-11}_amd64.iso
diff --git a/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec b/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec
index f2867f5..5c3a70f 100644
--- a/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec
+++ b/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec
@@ -9,5 +9,5 @@
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
-release_version: 10
-image_name: Sabayon_Linux_SpinBase_11_amd64_ami.img
+%env release_version: ${SABAYON_RELEASE:-11}
+%env image_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_amd64_ami.img
diff --git a/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec b/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec
index bd885ed..fdc9110 100644
--- a/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec
+++ b/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec
@@ -8,5 +8,5 @@
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
-release_version: 10
-tar_name: Sabayon_Linux_SpinBase_11_amd64_Amazon_EBS_ext4_filesystem_image.tar.gz
+%env release_version: ${SABAYON_RELEASE:-11}
+%env tar_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_amd64_Amazon_EBS_ext4_filesystem_image.tar.gz
diff --git a/molecules/sabayon-amd64-spinbase-openvz-template.spec b/molecules/sabayon-amd64-spinbase-openvz-template.spec
index cc3b7cd..77df365 100644
--- a/molecules/sabayon-amd64-spinbase-openvz-template.spec
+++ b/molecules/sabayon-amd64-spinbase-openvz-template.spec
@@ -8,5 +8,5 @@
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
-release_version: 10
-tar_name: Sabayon_Linux_SpinBase_11_amd64_openvz.tar.gz
+%env release_version: ${SABAYON_RELEASE:-11}
+%env tar_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_amd64_openvz.tar.gz
diff --git a/molecules/sabayon-amd64-spinbase.spec b/molecules/sabayon-amd64-spinbase.spec
index 7e62fdc..36b314a 100644
--- a/molecules/sabayon-amd64-spinbase.spec
+++ b/molecules/sabayon-amd64-spinbase.spec
@@ -3,7 +3,7 @@
 
 # Release Version
 # Keep this here, otherwise daily builds automagic won't work
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 SpinBase
@@ -13,4 +13,4 @@ release_desc: amd64 SpinBase
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
 # Keep this here and set, otherwise daily builds automagic won't work
-destination_iso_image_name: Sabayon_Linux_SpinBase_11_amd64.iso
+%env destination_iso_image_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_amd64.iso
diff --git a/molecules/sabayon-amd64-xfce.spec b/molecules/sabayon-amd64-xfce.spec
index 27cc223..6bd6caa 100644
--- a/molecules/sabayon-amd64-xfce.spec
+++ b/molecules/sabayon-amd64-xfce.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/xfce.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 Xfce
@@ -11,4 +11,4 @@ release_desc: amd64 Xfce
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_amd64_Xfce.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_Xfce.iso
diff --git a/molecules/sabayon-amd64-xfceforensic.spec b/molecules/sabayon-amd64-xfceforensic.spec
index dc2243a..08333cc 100644
--- a/molecules/sabayon-amd64-xfceforensic.spec
+++ b/molecules/sabayon-amd64-xfceforensic.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/forensicxfce.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 ForensicsXfce
diff --git a/molecules/sabayon-arm-beagleboard-xm-4G.spec b/molecules/sabayon-arm-beagleboard-xm-4G.spec
index a54f82a..5a56387 100644
--- a/molecules/sabayon-arm-beagleboard-xm-4G.spec
+++ b/molecules/sabayon-arm-beagleboard-xm-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a BeagleBoard xM
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_BeagleBoard_xM_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_BeagleBoard_xM_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-beagleboard-xm-8G.spec b/molecules/sabayon-arm-beagleboard-xm-8G.spec
index 1fa2c7c..dbd9cfb 100644
--- a/molecules/sabayon-arm-beagleboard-xm-8G.spec
+++ b/molecules/sabayon-arm-beagleboard-xm-8G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a BeagleBoard xM
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_BeagleBoard_xM_8GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_BeagleBoard_xM_8GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-beaglebone-base-2G.spec b/molecules/sabayon-arm-beaglebone-base-2G.spec
index 8475ec2..c1a94dd 100644
--- a/molecules/sabayon-arm-beaglebone-base-2G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-2G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a BeagleBone
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_BeagleBone_Base_2GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_BeagleBone_Base_2GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-beaglebone-base-4G.spec b/molecules/sabayon-arm-beaglebone-base-4G.spec
index 2f4cacc..0e26163 100644
--- a/molecules/sabayon-arm-beaglebone-base-4G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a BeagleBone
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_BeagleBone_Base_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_BeagleBone_Base_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-efikamx-4G.spec b/molecules/sabayon-arm-efikamx-4G.spec
index d5fdb31..f3a0650 100644
--- a/molecules/sabayon-arm-efikamx-4G.spec
+++ b/molecules/sabayon-arm-efikamx-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a Efika MX
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_EfikaMX_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_EfikaMX_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-efikamx-base-4G.spec b/molecules/sabayon-arm-efikamx-base-4G.spec
index 530c2c0..a0aca5e 100644
--- a/molecules/sabayon-arm-efikamx-base-4G.spec
+++ b/molecules/sabayon-arm-efikamx-base-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a Efika MX
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_EfikaMX_Base_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_EfikaMX_Base_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-pandaboard-4G.spec b/molecules/sabayon-arm-pandaboard-4G.spec
index 2c12fca..2f925d2 100644
--- a/molecules/sabayon-arm-pandaboard-4G.spec
+++ b/molecules/sabayon-arm-pandaboard-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a PandaBoard
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_PandaBoard_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_PandaBoard_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-arm-pandaboard-8G.spec b/molecules/sabayon-arm-pandaboard-8G.spec
index a2e1c19..8d13ce6 100644
--- a/molecules/sabayon-arm-pandaboard-8G.spec
+++ b/molecules/sabayon-arm-pandaboard-8G.spec
@@ -5,11 +5,11 @@
 release_desc: armv7a PandaBoard
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armv7a_PandaBoard_8GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7a_PandaBoard_8GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-beagleboard-xm-4G.spec b/molecules/sabayon-armel-beagleboard-xm-4G.spec
index eeb1834..83e19f5 100644
--- a/molecules/sabayon-armel-beagleboard-xm-4G.spec
+++ b/molecules/sabayon-armel-beagleboard-xm-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a BeagleBoard xM
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_BeagleBoard_xM_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_BeagleBoard_xM_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-beagleboard-xm-8G.spec b/molecules/sabayon-armel-beagleboard-xm-8G.spec
index 022219a..d78f3c1 100644
--- a/molecules/sabayon-armel-beagleboard-xm-8G.spec
+++ b/molecules/sabayon-armel-beagleboard-xm-8G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a BeagleBoard xM
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_BeagleBoard_xM_8GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_BeagleBoard_xM_8GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-beaglebone-base-2G.spec b/molecules/sabayon-armel-beaglebone-base-2G.spec
index fbd237d..2ba812d 100644
--- a/molecules/sabayon-armel-beaglebone-base-2G.spec
+++ b/molecules/sabayon-armel-beaglebone-base-2G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a BeagleBone
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_BeagleBone_Base_2GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_BeagleBone_Base_2GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-beaglebone-base-4G.spec b/molecules/sabayon-armel-beaglebone-base-4G.spec
index d0ca57b..8013364 100644
--- a/molecules/sabayon-armel-beaglebone-base-4G.spec
+++ b/molecules/sabayon-armel-beaglebone-base-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a BeagleBone
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_BeagleBone_Base_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_BeagleBone_Base_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-pandaboard-4G.spec b/molecules/sabayon-armel-pandaboard-4G.spec
index f6f3ff7..ebc9b2d 100644
--- a/molecules/sabayon-armel-pandaboard-4G.spec
+++ b/molecules/sabayon-armel-pandaboard-4G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a PandaBoard
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_PandaBoard_4GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_PandaBoard_4GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-armel-pandaboard-8G.spec b/molecules/sabayon-armel-pandaboard-8G.spec
index b7b28e5..b00bc22 100644
--- a/molecules/sabayon-armel-pandaboard-8G.spec
+++ b/molecules/sabayon-armel-pandaboard-8G.spec
@@ -5,11 +5,11 @@
 release_desc: armelv7a PandaBoard
 
 # Release Version (used to generate release_file)
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_11_armelv7a_PandaBoard_8GB.img
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armelv7a_PandaBoard_8GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
diff --git a/molecules/sabayon-x86-awesome.spec b/molecules/sabayon-x86-awesome.spec
index 346f728..99d430d 100644
--- a/molecules/sabayon-x86-awesome.spec
+++ b/molecules/sabayon-x86-awesome.spec
@@ -4,7 +4,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 Awesome
@@ -13,4 +13,4 @@ release_desc: x86 Awesome
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_Awesome.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_Awesome.iso
diff --git a/molecules/sabayon-x86-corecdx.spec b/molecules/sabayon-x86-corecdx.spec
index 2c44daa..4883628 100644
--- a/molecules/sabayon-x86-corecdx.spec
+++ b/molecules/sabayon-x86-corecdx.spec
@@ -1,7 +1,7 @@
 # use abs path, otherwise daily iso build automagic won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: x86 CoreCDX
 
 # pre chroot command, example, for 32bit chroots on 64bit system, you always
@@ -12,4 +12,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_CoreCDX_11_x86.iso
+%env destination_iso_image_name: Sabayon_Linux_CoreCDX_${SABAYON_RELEASE:-11}_x86.iso
diff --git a/molecules/sabayon-x86-e17.spec b/molecules/sabayon-x86-e17.spec
index 34e778e..222db6b 100644
--- a/molecules/sabayon-x86-e17.spec
+++ b/molecules/sabayon-x86-e17.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/e17.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 E17
@@ -14,4 +14,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_E17.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_E17.iso
diff --git a/molecules/sabayon-x86-gaming.spec b/molecules/sabayon-x86-gaming.spec
index 4cec13b..710e1a4 100644
--- a/molecules/sabayon-x86-gaming.spec
+++ b/molecules/sabayon-x86-gaming.spec
@@ -5,7 +5,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 Gaming Edition
@@ -14,4 +14,4 @@ release_desc: x86 Gaming Edition
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_x86_G.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_Gaming.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_Gaming.iso
diff --git a/molecules/sabayon-x86-gnome.spec b/molecules/sabayon-x86-gnome.spec
index 5fa210e..3b59a6f 100644
--- a/molecules/sabayon-x86-gnome.spec
+++ b/molecules/sabayon-x86-gnome.spec
@@ -4,7 +4,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 GNOME
@@ -13,4 +13,4 @@ release_desc: x86 GNOME
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_G.iso
diff --git a/molecules/sabayon-x86-hardenedserver.spec b/molecules/sabayon-x86-hardenedserver.spec
index 68a050c..3d1716d 100644
--- a/molecules/sabayon-x86-hardenedserver.spec
+++ b/molecules/sabayon-x86-hardenedserver.spec
@@ -1,7 +1,7 @@
 # use abs path, otherwise daily iso build automagic won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/hardenedserver.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: x86 Hardened Server
 
 # pre chroot command, example, for 32bit chroots on 64bit system, you always
@@ -12,4 +12,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_HardenedServer_11_x86.iso
+%env destination_iso_image_name: Sabayon_Linux_HardenedServer_${SABAYON_RELEASE:-11}_x86.iso
diff --git a/molecules/sabayon-x86-kde.spec b/molecules/sabayon-x86-kde.spec
index 647b570..3ed7ad7 100644
--- a/molecules/sabayon-x86-kde.spec
+++ b/molecules/sabayon-x86-kde.spec
@@ -4,7 +4,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 KDE
@@ -13,4 +13,4 @@ release_desc: x86 KDE
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_K.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_K.iso
diff --git a/molecules/sabayon-x86-lxde.spec b/molecules/sabayon-x86-lxde.spec
index ad42863..640d276 100644
--- a/molecules/sabayon-x86-lxde.spec
+++ b/molecules/sabayon-x86-lxde.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxde.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 LXDE
@@ -14,4 +14,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_LXDE.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_LXDE.iso
diff --git a/molecules/sabayon-x86-mate.spec b/molecules/sabayon-x86-mate.spec
index f2bde35..aa5b75d 100644
--- a/molecules/sabayon-x86-mate.spec
+++ b/molecules/sabayon-x86-mate.spec
@@ -4,7 +4,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: amd64 MATE
@@ -13,4 +13,4 @@ release_desc: amd64 MATE
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_MATE.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_MATE.iso
diff --git a/molecules/sabayon-x86-serverbase.spec b/molecules/sabayon-x86-serverbase.spec
index 998cfdf..ae7c931 100644
--- a/molecules/sabayon-x86-serverbase.spec
+++ b/molecules/sabayon-x86-serverbase.spec
@@ -1,7 +1,7 @@
 # use abs path, otherwise daily iso build automagic won't work
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/serverbase.common
 
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 release_desc: x86 ServerBase
 
 # pre chroot command, example, for 32bit chroots on 64bit system, you always
@@ -12,4 +12,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_ServerBase_11_x86.iso
+%env destination_iso_image_name: Sabayon_Linux_ServerBase_${SABAYON_RELEASE:-11}_x86.iso
diff --git a/molecules/sabayon-x86-spinbase-amazon-ami-template.spec b/molecules/sabayon-x86-spinbase-amazon-ami-template.spec
index 386a2e7..95a9284 100644
--- a/molecules/sabayon-x86-spinbase-amazon-ami-template.spec
+++ b/molecules/sabayon-x86-spinbase-amazon-ami-template.spec
@@ -9,5 +9,5 @@ prechroot: linux32
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
-release_version: 10
-image_name: Sabayon_Linux_SpinBase_11_x86_ami.img
+%env release_version: ${SABAYON_RELEASE:-11}
+%env image_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_x86_ami.img
diff --git a/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec b/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec
index e1cbd56..e9f9033 100644
--- a/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec
+++ b/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec
@@ -8,5 +8,5 @@ prechroot: linux32
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
-release_version: 10
-tar_name: Sabayon_Linux_SpinBase_11_x86_Amazon_EBS_ext4_filesystem_image.tar.gz
+%env release_version: ${SABAYON_RELEASE:-11}
+%env tar_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_x86_Amazon_EBS_ext4_filesystem_image.tar.gz
diff --git a/molecules/sabayon-x86-spinbase-openvz-template.spec b/molecules/sabayon-x86-spinbase-openvz-template.spec
index c971237..e4f5926 100644
--- a/molecules/sabayon-x86-spinbase-openvz-template.spec
+++ b/molecules/sabayon-x86-spinbase-openvz-template.spec
@@ -8,5 +8,5 @@ prechroot: linux32
 # Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
-release_version: 10
-tar_name: Sabayon_Linux_SpinBase_11_x86_openvz.tar.gz
+%env release_version: ${SABAYON_RELEASE:-11}
+%env tar_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_x86_openvz.tar.gz
diff --git a/molecules/sabayon-x86-spinbase.spec b/molecules/sabayon-x86-spinbase.spec
index b5d2cda..818e582 100644
--- a/molecules/sabayon-x86-spinbase.spec
+++ b/molecules/sabayon-x86-spinbase.spec
@@ -6,7 +6,7 @@ prechroot: linux32
 
 # Release Version
 # Keep this here, otherwise daily builds automagic won't work
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 SpinBase
@@ -16,4 +16,4 @@ release_desc: x86 SpinBase
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
 # Keep this here and set, otherwise daily builds automagic won't work
-destination_iso_image_name: Sabayon_Linux_SpinBase_11_x86.iso
+%env destination_iso_image_name: Sabayon_Linux_SpinBase_${SABAYON_RELEASE:-11}_x86.iso
diff --git a/molecules/sabayon-x86-xfce.spec b/molecules/sabayon-x86-xfce.spec
index 547c289..c880b57 100644
--- a/molecules/sabayon-x86-xfce.spec
+++ b/molecules/sabayon-x86-xfce.spec
@@ -2,7 +2,7 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/xfce.common
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 Xfce
@@ -14,4 +14,4 @@ prechroot: linux32
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-destination_iso_image_name: Sabayon_Linux_11_x86_Xfce.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_Xfce.iso
diff --git a/molecules/sabayon-x86-xfceforensic.spec b/molecules/sabayon-x86-xfceforensic.spec
index b21b78c..1226923 100644
--- a/molecules/sabayon-x86-xfceforensic.spec
+++ b/molecules/sabayon-x86-xfceforensic.spec
@@ -4,7 +4,7 @@
 prechroot: linux32
 
 # Release Version
-release_version: 10
+%env release_version: ${SABAYON_RELEASE:-11}
 
 # Release Version string description
 release_desc: x86 ForensicsXfce
diff --git a/scripts/amd64_x86_pre_iso_script.sh b/scripts/amd64_x86_pre_iso_script.sh
index c4ee584..401dbe2 100755
--- a/scripts/amd64_x86_pre_iso_script.sh
+++ b/scripts/amd64_x86_pre_iso_script.sh
@@ -43,7 +43,7 @@ cp "${grub_source}" "${grub_destination}" || exit 1
 "${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
 
 ver=${RELEASE_VERSION}
-[[ -z "${ver}" ]] && ver=${CUR_DATE}
+[[ -z "${ver}" ]] && ver=${SABAYON_RELEASE}
 [[ -z "${ver}" ]] && ver="6"
 
 sed -i "s/__VERSION__/${ver}/g" "${isolinux_destination}" || exit 1
diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh
index 340fe9d..eb3826a 100755
--- a/scripts/generic_pre_iso_script.sh
+++ b/scripts/generic_pre_iso_script.sh
@@ -44,7 +44,7 @@ cp "${grub_source}" "${grub_destination}" || exit 1
 "${SABAYON_MOLECULE_HOME}"/scripts/make_grub_efi.sh || exit 1
 
 ver=${RELEASE_VERSION}
-[[ -z "${ver}" ]] && ver=${CUR_DATE}
+[[ -z "${ver}" ]] && ver=${SABAYON_RELEASE}
 [[ -z "${ver}" ]] && ver="6"
 
 sed -i "s/__VERSION__/${ver}/g" "${isolinux_destination}" || exit 1
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 6450215..c417a81 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -53,7 +53,9 @@ REMASTER_TAR_SPECS_TAR=()
 # Default Sabayon release version to current date
 # composed by YYYYMMDD. This is overridden by the
 # monthly if branch below.
-CUR_DATE=$(date -u +%Y%m%d)
+if [ -z "${SABAYON_RELEASE}" ]; then  # make possible to override it
+    SABAYON_RELEASE=$(date -u +%Y%m%d)
+fi
 # ISO TAG is instead used as part of the images push
 # to our mirror. It is always "DAILY" but it gets a special
 # meaning for monthly releases.
@@ -163,13 +165,13 @@ elif [ "${ACTION}" = "dailybase" ]; then
 		"${DISTRO_NAME}_SpinBase_${ISO_TAG}_amd64.iso"
 	)
 elif [ "${ACTION}" = "monthly" ]; then
-	CUR_DATE=$(date -u +%g.%m)
-	if [ -z "${CUR_DATE}" ]; then
-		echo "Cannot set CUR_DATE, wtf?" >&2
+	SABAYON_RELEASE=$(date -u +%g.%m)
+	if [ -z "${SABAYON_RELEASE}" ]; then
+		echo "Cannot set SABAYON_RELEASE, wtf?" >&2
 		exit 1
 	fi
-	# Rewrite ISO_TAG to CUR_DATE
-	ISO_TAG="${CUR_DATE}"
+	# Rewrite ISO_TAG to SABAYON_RELEASE
+	ISO_TAG="${SABAYON_RELEASE}"
 	OLD_ISO_TAG=$(date -u --date="last month" +%g.%m)
 	if [ -z "${OLD_ISO_TAG}" ]; then
 		echo "Cannot set OLD_ISO_TAG, wtf?" >&2
@@ -226,9 +228,10 @@ DAILY_TMPDIR=
 export ETP_NONINTERACTIVE=1
 export BUILDING_DAILY
 
-LOG_FILE="/var/log/molecule/autobuild-${CUR_DATE}-${$}.log"
-# to make ISO remaster spec files working (pre_iso_script)
-export CUR_DATE
+LOG_FILE="/var/log/molecule/autobuild-${SABAYON_RELEASE}-${$}.log"
+# to make ISO remaster spec files working (pre_iso_script) and
+# make molecules grab a proper release version
+export SABAYON_RELEASE
 
 echo "DO_PUSH=${DO_PUSH}"
 echo "DRY_RUN=${DRY_RUN}"
@@ -335,17 +338,11 @@ build_sabayon() {
 		echo "inner_source_chroot_script: ${inner_chroot}" >> "${dst}"
 
 		# tweak iso image name
-		sed -i "s/^#.*destination_iso_image_name/destination_iso_image_name:/" \
-			"${dst}" || return 1
-		sed -i "s/destination_iso_image_name.*/destination_iso_image_name: ${SOURCE_SPECS_ISO[i]}/" \
-			"${dst}" || return 1
-
-		# tweak release version
-		sed -i "s/release_version.*/release_version: ${CUR_DATE}/" \
+		sed -i "s/destination_iso_image_name:.*/destination_iso_image_name: ${SOURCE_SPECS_ISO[i]}/" \
 			"${dst}" || return 1
 
 		echo -n "${dst}: iso: ${SOURCE_SPECS_ISO[i]} "
-		echo "date: ${CUR_DATE}"
+		echo "date: ${SABAYON_RELEASE}"
 		source_specs+=( "${dst}" )
 	done
 
@@ -358,16 +355,11 @@ build_sabayon() {
 		echo "inner_source_chroot_script: ${inner_chroot}" >> "${dst}"
 
 		# tweak iso image name
-		sed -i "s/^#.*image_name/image_name:/" "${dst}" || return 1
-		sed -i "s/image_name.*/image_name: ${ARM_SOURCE_SPECS_IMG[i]}/" \
-			"${dst}" || return 1
-
-		# tweak release version
-		sed -i "s/release_version.*/release_version: ${CUR_DATE}/" \
+		sed -i "s/image_name:.*/image_name: ${ARM_SOURCE_SPECS_IMG[i]}/" \
 			"${dst}" || return 1
 
 		echo -n "${dst}: image: ${ARM_SOURCE_SPECS_IMG[i]} "
-                echo "date: ${CUR_DATE}"
+                echo "date: ${SABAYON_RELEASE}"
 		arm_source_specs+=( "${dst}" )
 	done
 
@@ -378,17 +370,11 @@ build_sabayon() {
 		cp "${src}" "${dst}" -p || return 1
 
 		# tweak iso image name
-		sed -i "s/^#.*destination_iso_image_name/destination_iso_image_name:/" "${dst}" \
-			|| return 1
-		sed -i "s/destination_iso_image_name.*/destination_iso_image_name: ${REMASTER_SPECS_ISO[i]}/" \
-			"${dst}" || return 1
-
-		# tweak release version
-		sed -i "s/release_version.*/release_version: ${CUR_DATE}/" \
+		sed -i "s/destination_iso_image_name:.*/destination_iso_image_name: ${REMASTER_SPECS_ISO[i]}/" \
 			"${dst}" || return 1
 
 		echo -n "${dst}: iso: ${REMASTER_SPECS_ISO[i]} "
-		echo "date: ${CUR_DATE}"
+		echo "date: ${SABAYON_RELEASE}"
 		remaster_specs+=( "${dst}" )
 	done
 
@@ -398,14 +384,10 @@ build_sabayon() {
 		cp "${src}" "${dst}" -p || return 1
 
 		# tweak tar name
-		sed -i "s/^#.*tar_name/tar_name:/" "${dst}" || return 1
-		sed -i "s/tar_name.*/tar_name: ${REMASTER_TAR_SPECS_TAR[i]}/" "${dst}" || return 1
-
-		# tweak release version
-		sed -i "s/release_version.*/release_version: ${CUR_DATE}/" "${dst}" || return 1
+		sed -i "s/tar_name:.*/tar_name: ${REMASTER_TAR_SPECS_TAR[i]}/" "${dst}" || return 1
 
 		echo -n "${dst}: tar: ${REMASTER_TAR_SPECS_TAR[i]} "
-		echo "date: ${CUR_DATE}"
+		echo "date: ${SABAYON_RELEASE}"
 		remaster_specs+=( "${dst}" )
 	done
 
@@ -486,7 +468,7 @@ if [ -n "${DO_STDOUT}" ]; then
 		out=${?}
 	fi
 else
-	log_file="/var/log/molecule/autobuild-${CUR_DATE}-${$}.log"
+	log_file="/var/log/molecule/autobuild-${SABAYON_RELEASE}-${$}.log"
 	build_sabayon &> "${log_file}"
 	out=${?}
 	if [ "${out}" = "0" ]; then
diff --git a/scripts/spinbase_pre_iso_script.sh b/scripts/spinbase_pre_iso_script.sh
index 46600e7..aec8ffe 100755
--- a/scripts/spinbase_pre_iso_script.sh
+++ b/scripts/spinbase_pre_iso_script.sh
@@ -37,7 +37,7 @@ echo "Sabayon ISO image build information" > "${build_file}" || exit 1
 echo "Built on: ${build_date}" >> "${build_file}" || exit 1
 
 ver=${RELEASE_VERSION}
-[[ -z "${ver}" ]] && ver=${CUR_DATE}
+[[ -z "${ver}" ]] && ver=${SABAYON_RELEASE}
 [[ -z "${ver}" ]] && ver="6"
 
 isolinux_dest="${CDROOT_DIR}/isolinux/txt.cfg"