diff --git a/molecules/sabayon-amd64-enlightenment.spec b/molecules/sabayon-amd64-enlightenment.spec
index a3fee61..5bfae21 100644
--- a/molecules/sabayon-amd64-enlightenment.spec
+++ b/molecules/sabayon-amd64-enlightenment.spec
@@ -9,7 +9,7 @@
 release_desc: amd64 Enlightenment
 
 # Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Enlightenment.iso
diff --git a/molecules/sabayon-amd64-gnome-forensics.spec b/molecules/sabayon-amd64-gnome-forensics.spec
index db93181..b4c443f 100644
--- a/molecules/sabayon-amd64-gnome-forensics.spec
+++ b/molecules/sabayon-amd64-gnome-forensics.spec
@@ -10,6 +10,6 @@
 release_desc: amd64 ForensicsGnome
 
 # Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 
 destination_iso_image_name: Sabayon_Linux_DAILY_amd64_ForensicsGnome.iso
diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec
index 63140a2..fdb7d0e 100644
--- a/molecules/sabayon-amd64-gnome.spec
+++ b/molecules/sabayon-amd64-gnome.spec
@@ -10,5 +10,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 GNOME
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_GNOME.iso
diff --git a/molecules/sabayon-amd64-kde.spec b/molecules/sabayon-amd64-kde.spec
index d1b2fd7..58ac149 100644
--- a/molecules/sabayon-amd64-kde.spec
+++ b/molecules/sabayon-amd64-kde.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 KDE
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_KDE.iso
diff --git a/molecules/sabayon-amd64-lxqt.spec b/molecules/sabayon-amd64-lxqt.spec
index 2c36f58..4a207dc 100644
--- a/molecules/sabayon-amd64-lxqt.spec
+++ b/molecules/sabayon-amd64-lxqt.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 LXQt
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_LXQt.iso
diff --git a/molecules/sabayon-amd64-mate.spec b/molecules/sabayon-amd64-mate.spec
index a823a39..9a2ab26 100644
--- a/molecules/sabayon-amd64-mate.spec
+++ b/molecules/sabayon-amd64-mate.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 MATE
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_MATE.iso
diff --git a/molecules/sabayon-amd64-minimal.spec b/molecules/sabayon-amd64-minimal.spec
index 220d8e2..9637219 100644
--- a/molecules/sabayon-amd64-minimal.spec
+++ b/molecules/sabayon-amd64-minimal.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 Minimal
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Minimal.iso
diff --git a/molecules/sabayon-amd64-server.spec b/molecules/sabayon-amd64-server.spec
index 82767af..f5de084 100644
--- a/molecules/sabayon-amd64-server.spec
+++ b/molecules/sabayon-amd64-server.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 Server
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Server.iso
diff --git a/molecules/sabayon-amd64-xfce.spec b/molecules/sabayon-amd64-xfce.spec
index 4d83cf0..c764bea 100644
--- a/molecules/sabayon-amd64-xfce.spec
+++ b/molecules/sabayon-amd64-xfce.spec
@@ -5,5 +5,5 @@
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 Xfce
 
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/${SABAYON_SOURCE_ISO}
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Xfce.iso