diff --git a/molecules/arm-base.common b/molecules/arm-base.common
index d98f984..658ced4 100644
--- a/molecules/arm-base.common
+++ b/molecules/arm-base.common
@@ -49,9 +49,6 @@ execution_strategy: chroot_to_mmc
 # Destination directory for the image path (MANDATORY)
 %env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images
 
-# Path to source chroot (mandatory)
-%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv7l_core-2012
-
 # Release file that will be created onto the root filesystem
 release_file: /etc/sabayon-edition
 
diff --git a/molecules/armv7-base.common b/molecules/armv7-base.common
new file mode 100644
index 0000000..321d52b
--- /dev/null
+++ b/molecules/armv7-base.common
@@ -0,0 +1,4 @@
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+
+# Path to source chroot (mandatory)
+%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv7l_core-2012
diff --git a/molecules/sabayon-arm-beagleboard-4G.spec b/molecules/sabayon-arm-beagleboard-4G.spec
index 74bec14..54fc6fb 100644
--- a/molecules/sabayon-arm-beagleboard-4G.spec
+++ b/molecules/sabayon-arm-beagleboard-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-beagleboard-xm-4G.spec b/molecules/sabayon-arm-beagleboard-xm-4G.spec
index df13660..b01f344 100644
--- a/molecules/sabayon-arm-beagleboard-xm-4G.spec
+++ b/molecules/sabayon-arm-beagleboard-xm-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard-xm.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-beaglebone-4G.spec b/molecules/sabayon-arm-beaglebone-4G.spec
index 08023d3..323ab44 100644
--- a/molecules/sabayon-arm-beaglebone-4G.spec
+++ b/molecules/sabayon-arm-beaglebone-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-beaglebone-black-4G.spec b/molecules/sabayon-arm-beaglebone-black-4G.spec
index 2b2e0f1..3f50267 100644
--- a/molecules/sabayon-arm-beaglebone-black-4G.spec
+++ b/molecules/sabayon-arm-beaglebone-black-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-efikamx-4G.spec b/molecules/sabayon-arm-efikamx-4G.spec
index b5a0bd5..439984b 100644
--- a/molecules/sabayon-arm-efikamx-4G.spec
+++ b/molecules/sabayon-arm-efikamx-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/efikamx-base.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-odroid-u2-x2-4G.spec b/molecules/sabayon-arm-odroid-u2-x2-4G.spec
index ca03b10..fa7928a 100644
--- a/molecules/sabayon-arm-odroid-u2-x2-4G.spec
+++ b/molecules/sabayon-arm-odroid-u2-x2-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/odroid.common
 
 # Release desc (the actual release description)
diff --git a/molecules/sabayon-arm-pandaboard-4G.spec b/molecules/sabayon-arm-pandaboard-4G.spec
index 7409148..d8bd5dc 100644
--- a/molecules/sabayon-arm-pandaboard-4G.spec
+++ b/molecules/sabayon-arm-pandaboard-4G.spec
@@ -1,4 +1,4 @@
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv7-base.common
 %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/pandaboard.common
 
 # Release desc (the actual release description)