diff --git a/config/boards/clearfogbase.conf b/config/boards/clearfogbase.conf
index b26a27c0a..74ee4afbe 100644
--- a/config/boards/clearfogbase.conf
+++ b/config/boards/clearfogbase.conf
@@ -2,9 +2,8 @@
 BOARD_NAME="Clearfog Base"
 LINUXFAMILY="mvebu"
 BOOTCONFIG="armada_38x_clearfog_config"
-MODULES=""
+MODULES="mv_cesa"
 MODULES_NEXT="mv_cesa"
-MODULES_DEV="mv_cesa"
 CLI_TARGET="jessie,xenial:default,next"
 KERNEL_TARGET="default,next"
 #
diff --git a/config/boards/clearfogpro.conf b/config/boards/clearfogpro.conf
index 8b2838d59..f98e0bc5d 100644
--- a/config/boards/clearfogpro.conf
+++ b/config/boards/clearfogpro.conf
@@ -2,9 +2,9 @@
 BOARD_NAME="Clearfog Pro"
 LINUXFAMILY="mvebu"
 BOOTCONFIG="armada_38x_clearfog_config"
-MODULES=""
+MODULES="mv_cesa"
 MODULES_NEXT="#mv88e6xxx_drv mv_cesa"
-MODULES_DEV="mv_cesa"
+MODULES_DEV=""
 CLI_TARGET="jessie,xenial:default,next"
 KERNEL_TARGET="default,next"
 #
diff --git a/patch/kernel/mvebu-default/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/mvebu-default/packaging-4.x-with-postinstall-scripts.patch
similarity index 96%
rename from patch/kernel/mvebu-default/packaging-4.x-DEV-with-postinstall-scripts.patch
rename to patch/kernel/mvebu-default/packaging-4.x-with-postinstall-scripts.patch
index 422e3279c..50d3519cf 100644
--- a/patch/kernel/mvebu-default/packaging-4.x-DEV-with-postinstall-scripts.patch
+++ b/patch/kernel/mvebu-default/packaging-4.x-with-postinstall-scripts.patch
@@ -41,11 +41,11 @@ index 6c3b038..cc9b3c0 100755
 -fwpackagename=linux-firmware-image-$version
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
-+packagename=linux-image-dev"$LOCALVERSION"
-+fwpackagename=linux-firmware-image-dev"$LOCALVERSION"
-+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION"
-+dtb_packagename=linux-dtb-dev"$LOCALVERSION"
-+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION"
++packagename=linux-image"$LOCALVERSION"
++fwpackagename=linux-firmware-image"$LOCALVERSION"
++kernel_headers_packagename=linux-headers"$LOCALVERSION"
++dtb_packagename=linux-dtb"$LOCALVERSION"
++libc_headers_packagename=linux-libc-dev"$LOCALVERSION"
  dbg_packagename=$packagename-dbg
  debarch=
  forcearch=