diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index b088f65..4f005e9 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -46,7 +46,13 @@ IMAGE_INSTALL:append = "libcurl \
                         evtest \
                         raspi-gpio \
                         " 
+patch_rootfs () {
+    install -d ${IMAGE_ROOTFS}/var/etc
+    install -m 0644 ${IMAGE_ROOTFS}/etc/passwd ${IMAGE_ROOTFS}/var/etc/
+    install -m 0644 ${IMAGE_ROOTFS}/etc/group ${IMAGE_ROOTFS}/var/etc/
+    rm ${IMAGE_ROOTFS}/etc/passwd
+    rm ${IMAGE_ROOTFS}/etc/group
+}
+
+IMAGE_POSTPROCESS_COMMAND += " patch_rootfs "
 
-# 
-# usermod -a -G audio diya;
-# usermod -a -G avahi diya
\ No newline at end of file
diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb
index 0b38a5c..a0940ed 100644
--- a/recipes-diya/diya-overlay/diya-overlay.bb
+++ b/recipes-diya/diya-overlay/diya-overlay.bb
@@ -28,12 +28,3 @@ do_install() {
     install -m 0755 ${WORKDIR}/expandfs.sh ${D}/usr/bin/expandfs.sh
     install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
 }
-
-pkg_postinst:${PN}-patch () {
-#!/bin/sh
-install -d ${D}/var/etc
-install -m 0644 ${D}/etc/passwd ${D}/var/etc/
-install -m 0644 ${D}/etc/group ${D}/var/etc/
-rm ${D}/etc/passwd
-rm ${D}/etc/group
-}
\ No newline at end of file