diff --git a/molecules/sabayon-amd64-mate-dev.spec b/molecules/sabayon-amd64-mate-dev.spec
new file mode 100644
index 0000000..444e4f2
--- /dev/null
+++ b/molecules/sabayon-amd64-mate-dev.spec
@@ -0,0 +1,9 @@
+# Use abs path, otherwise daily builds automagic won't work
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/mate.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common
+
+%env release_version: ${SABAYON_RELEASE:-LATEST}
+release_desc: amd64 MATE Development
+
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase-dev.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_MATE-dev.iso
diff --git a/molecules/sabayon-amd64-mate.spec b/molecules/sabayon-amd64-mate.spec
index 5b74171..a823a39 100644
--- a/molecules/sabayon-amd64-mate.spec
+++ b/molecules/sabayon-amd64-mate.spec
@@ -2,14 +2,8 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/mate.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common
 
-# Release Version
 %env release_version: ${SABAYON_RELEASE:-LATEST}
-
-# Release Version string description
 release_desc: amd64 MATE
 
-# Path to source ISO file (MANDATORY)
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso
-
-# Destination ISO image name, call whatever you want.iso, not mandatory
 %env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_MATE.iso