diff --git a/components/init b/components/init
index c6eb21992..1cfa60fbe 100755
--- a/components/init
+++ b/components/init
@@ -133,7 +133,7 @@ def main():
 	# Configuring default hooks
 	os.makedirs('config/hooks', exist_ok=True)
 
-	for hook in glob.glob('/usr/share/live/build/hooks/*.hook*'):
+	for hook in glob.glob('/usr/share/live/build/hooks/all/*.hook*'):
 		os.symlink(hook, os.path.join('config/hooks/' + os.path.basename(hook)))
 
 	# Configuring default includes
diff --git a/share/hooks/0010-disable-kexec-tools.hook.chroot b/share/hooks/all/0010-disable-kexec-tools.hook.chroot
similarity index 100%
rename from share/hooks/0010-disable-kexec-tools.hook.chroot
rename to share/hooks/all/0010-disable-kexec-tools.hook.chroot
diff --git a/share/hooks/0020-create-mtab-symlink.hook.chroot b/share/hooks/all/0020-create-mtab-symlink.hook.chroot
similarity index 100%
rename from share/hooks/0020-create-mtab-symlink.hook.chroot
rename to share/hooks/all/0020-create-mtab-symlink.hook.chroot
diff --git a/share/hooks/0100-remove-adjtime-configuration.hook.chroot b/share/hooks/all/0100-remove-adjtime-configuration.hook.chroot
similarity index 100%
rename from share/hooks/0100-remove-adjtime-configuration.hook.chroot
rename to share/hooks/all/0100-remove-adjtime-configuration.hook.chroot
diff --git a/share/hooks/0110-remove-backup-files.hook.chroot b/share/hooks/all/0110-remove-backup-files.hook.chroot
similarity index 100%
rename from share/hooks/0110-remove-backup-files.hook.chroot
rename to share/hooks/all/0110-remove-backup-files.hook.chroot
diff --git a/share/hooks/0120-remove-dbus-machine-id.hook.chroot b/share/hooks/all/0120-remove-dbus-machine-id.hook.chroot
similarity index 100%
rename from share/hooks/0120-remove-dbus-machine-id.hook.chroot
rename to share/hooks/all/0120-remove-dbus-machine-id.hook.chroot
diff --git a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot b/share/hooks/all/0130-remove-gnome-icon-cache.hook.chroot
similarity index 100%
rename from share/hooks/0130-remove-gnome-icon-cache.hook.chroot
rename to share/hooks/all/0130-remove-gnome-icon-cache.hook.chroot
diff --git a/share/hooks/0140-remove-log-files.hook.chroot b/share/hooks/all/0140-remove-log-files.hook.chroot
similarity index 100%
rename from share/hooks/0140-remove-log-files.hook.chroot
rename to share/hooks/all/0140-remove-log-files.hook.chroot
diff --git a/share/hooks/0150-remove-mdadm-configuration.hook.chroot b/share/hooks/all/0150-remove-mdadm-configuration.hook.chroot
similarity index 100%
rename from share/hooks/0150-remove-mdadm-configuration.hook.chroot
rename to share/hooks/all/0150-remove-mdadm-configuration.hook.chroot
diff --git a/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot b/share/hooks/all/0160-remove-openssh-server-host-keys.hook.chroot
similarity index 100%
rename from share/hooks/0160-remove-openssh-server-host-keys.hook.chroot
rename to share/hooks/all/0160-remove-openssh-server-host-keys.hook.chroot
diff --git a/share/hooks/0170-remove-python-py.hook.chroot b/share/hooks/all/0170-remove-python-py.hook.chroot
similarity index 100%
rename from share/hooks/0170-remove-python-py.hook.chroot
rename to share/hooks/all/0170-remove-python-py.hook.chroot
diff --git a/share/hooks/0180-remove-systemd-machine-id.hook.chroot b/share/hooks/all/0180-remove-systemd-machine-id.hook.chroot
similarity index 100%
rename from share/hooks/0180-remove-systemd-machine-id.hook.chroot
rename to share/hooks/all/0180-remove-systemd-machine-id.hook.chroot
diff --git a/share/hooks/0190-remove-temporary-files.hook.chroot b/share/hooks/all/0190-remove-temporary-files.hook.chroot
similarity index 100%
rename from share/hooks/0190-remove-temporary-files.hook.chroot
rename to share/hooks/all/0190-remove-temporary-files.hook.chroot
diff --git a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot b/share/hooks/all/0195-remove-ssl-cert-snakeoil.hook.chroot
similarity index 100%
rename from share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot
rename to share/hooks/all/0195-remove-ssl-cert-snakeoil.hook.chroot
diff --git a/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot b/share/hooks/all/0200-remove-udev-persistent-cd-rules.hook.chroot
similarity index 100%
rename from share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot
rename to share/hooks/all/0200-remove-udev-persistent-cd-rules.hook.chroot
diff --git a/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot b/share/hooks/all/0300-remove-udev-persistent-net-rules.hook.chroot
similarity index 100%
rename from share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot
rename to share/hooks/all/0300-remove-udev-persistent-net-rules.hook.chroot
diff --git a/share/hooks/0400-update-apt-file-cache.hook.chroot b/share/hooks/all/0400-update-apt-file-cache.hook.chroot
similarity index 100%
rename from share/hooks/0400-update-apt-file-cache.hook.chroot
rename to share/hooks/all/0400-update-apt-file-cache.hook.chroot
diff --git a/share/hooks/0410-update-apt-xapian-index.hook.chroot b/share/hooks/all/0410-update-apt-xapian-index.hook.chroot
similarity index 100%
rename from share/hooks/0410-update-apt-xapian-index.hook.chroot
rename to share/hooks/all/0410-update-apt-xapian-index.hook.chroot
diff --git a/share/hooks/0420-update-glx-alternative.hook.chroot b/share/hooks/all/0420-update-glx-alternative.hook.chroot
similarity index 100%
rename from share/hooks/0420-update-glx-alternative.hook.chroot
rename to share/hooks/all/0420-update-glx-alternative.hook.chroot
diff --git a/share/hooks/0430-update-mlocate-database.hook.chroot b/share/hooks/all/0430-update-mlocate-database.hook.chroot
similarity index 100%
rename from share/hooks/0430-update-mlocate-database.hook.chroot
rename to share/hooks/all/0430-update-mlocate-database.hook.chroot
diff --git a/share/hooks/0440-update-nvidia-alternative.hook.chroot b/share/hooks/all/0440-update-nvidia-alternative.hook.chroot
similarity index 100%
rename from share/hooks/0440-update-nvidia-alternative.hook.chroot
rename to share/hooks/all/0440-update-nvidia-alternative.hook.chroot
diff --git a/share/hooks/0910-remove-apt-sources-lists b/share/hooks/all/0910-remove-apt-sources-lists
similarity index 100%
rename from share/hooks/0910-remove-apt-sources-lists
rename to share/hooks/all/0910-remove-apt-sources-lists