diff --git a/lists/foris.lua.m4 b/lists/foris.lua.m4
index 558fd158e8d349c8f966f83ed72609495429c316..d2edcafcc88c554c334ce981114158981e3eeea2 100644
--- a/lists/foris.lua.m4
+++ b/lists/foris.lua.m4
@@ -1,10 +1,11 @@
 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
-Install("foris", "foris-diagnostics-plugin", "turris-webapps", "lighttpd-https-cert", { priority = 40 })
+Install("foris", "foris-diagnostics-plugin", "foris-storage-plugin", "turris-webapps", "lighttpd-https-cert", { priority = 40 })
 if for_l10n then
 	for_l10n("foris-l10n-")
 	for_l10n("foris-diagnostics-plugin-l10n-")
+	for_l10n("foris-storage-plugin-l10n-")
 	for_l10n('pkglists-l10n-')
 end
 
diff --git a/lists/pkglists/lxc.lua.m4 b/lists/pkglists/lxc.lua.m4
index 0e840a93fd8e1db10a0a4b559158363ee9b3168f..001e2cb88b038163482fef06a19e51306faaa949 100644
--- a/lists/pkglists/lxc.lua.m4
+++ b/lists/pkglists/lxc.lua.m4
@@ -1,11 +1,12 @@
 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
-Install("kmod-veth", { priority = 40 })
 Install("lxc", { priority = 40 })
 forInstall(lxc,attach,auto,console,create,info,ls,monitor,monitord,snapshot,start,stop)
+
 Install("luci-app-lxc", { priority = 40 })
-Install("foris-storage-plugin", { priority = 40 })
+
+Install("kmod-veth", { priority = 40 })
 Install("gnupg", "gnupg-utils", "getopt", "tar", "wget", { priority = 40 })
 
 _END_FEATURE_GUARD_
diff --git a/lists/pkglists/nas.lua.m4 b/lists/pkglists/nas.lua.m4
index 473d8e17005d5426d88ffbfc04b64f10d5f700ba..767757deef93e7dbbeaeb7bd61bf23a7ad834bc3 100644
--- a/lists/pkglists/nas.lua.m4
+++ b/lists/pkglists/nas.lua.m4
@@ -23,7 +23,6 @@ Install("fdisk", "cfdisk", "hdparm", "resize2fs", "partx-utils", { priority = 40
 Install("acl", "attr", { priority = 40 })
 Install("blockd" , "smartd", "smartmontools", { priority = 40 })
 Install("swap-utils", { priority = 40 })
-Install("foris-storage-plugin", { priority = 40 })
 
 -- File systems
 Install("lvm2", "mdadm", "dosfstools", "mkhfs", "btrfs-progs", "davfs2", "e2fsprogs", "fuse-utils", "xfs-mkfs", { priority = 40 })
diff --git a/lists/pkglists/nextcloud.lua b/lists/pkglists/nextcloud.lua
deleted file mode 100644
index 6d7cf0a0be75dadf509de0a1d04161ff2f790d33..0000000000000000000000000000000000000000
--- a/lists/pkglists/nextcloud.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-Install("foris-storage-plugin", { priority = 40 })
-Install("nextcloud", { priority = 40 })
-Install("nextcloud-install", { priority = 40 })
diff --git a/lists/pkglists/nextcloud.lua.m4 b/lists/pkglists/nextcloud.lua.m4
new file mode 100644
index 0000000000000000000000000000000000000000..084ef4d0c4193b365a67f6249554db3a75190c88
--- /dev/null
+++ b/lists/pkglists/nextcloud.lua.m4
@@ -0,0 +1,6 @@
+include(utils.m4)dnl Include utility macros
+_FEATURE_GUARD_
+
+Install("nextcloud", "nextcloud-install", { priority = 40 })
+
+_END_FEATURE_GUARD_