diff --git a/molecules/gnome.common b/molecules/gnome.common
index dda9ba8..bffadbb 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -32,9 +32,6 @@ extra_mksquashfs_parameters: -comp xz
 # Used to umount /proc and unbind packages dir
 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh
 
-# 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/generic_pre_iso_script.sh GNOME
-
 # Destination directory for the ISO image path (MANDATORY)
 %env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
 
diff --git a/molecules/sabayon-amd64-gnome-dev.spec b/molecules/sabayon-amd64-gnome-dev.spec
index 8e7b286..47d180e 100644
--- a/molecules/sabayon-amd64-gnome-dev.spec
+++ b/molecules/sabayon-amd64-gnome-dev.spec
@@ -2,6 +2,11 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common
 
+# Pre-ISO building script. Hook to be able to copy kernel images in place,
+# for example.
+# NOTE: Not inserted on gnome.common to fix use of forensics pre_iso_script.
+%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh GNOME
+
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 GNOME Development
 
diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec
index 88e528e..63140a2 100644
--- a/molecules/sabayon-amd64-gnome.spec
+++ b/molecules/sabayon-amd64-gnome.spec
@@ -2,6 +2,11 @@
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common
 
+# Pre-ISO building script. Hook to be able to copy kernel images in place,
+# for example.
+# NOTE: Not inserted on gnome.common to fix use of forensics pre_iso_script.
+%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh GNOME
+
 %env release_version: ${SABAYON_RELEASE:-LATEST}
 release_desc: amd64 GNOME