diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index 609200eb7c..720243afc6 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -5,7 +5,7 @@ if [ -z "$TARGET" ]; then
     exit 1
 fi
 
-rm -f $TARGET/boot/.gitkeep
+find $TARGET -name '.empty' | xargs -r rm
 
 # /etc stuff
 rm -rf $TARGET/etc/network/
diff --git a/board/common/overlay/etc/adminpasswd.d/.keep b/board/common/overlay/etc/adminpasswd.d/.empty
similarity index 100%
rename from board/common/overlay/etc/adminpasswd.d/.keep
rename to board/common/overlay/etc/adminpasswd.d/.empty
diff --git a/board/common/overlay/usr/share/dataskel/etc/.keep b/board/common/overlay/usr/share/dataskel/etc/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/etc/.keep
rename to board/common/overlay/usr/share/dataskel/etc/.empty
diff --git a/board/common/overlay/usr/share/dataskel/log/.keep b/board/common/overlay/usr/share/dataskel/log/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/log/.keep
rename to board/common/overlay/usr/share/dataskel/log/.empty
diff --git a/board/common/overlay/usr/share/dataskel/media/.keep b/board/common/overlay/usr/share/dataskel/media/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/media/.keep
rename to board/common/overlay/usr/share/dataskel/media/.empty
diff --git a/board/common/overlay/usr/share/dataskel/varlib/.keep b/board/common/overlay/usr/share/dataskel/varlib/.empty
similarity index 100%
rename from board/common/overlay/usr/share/dataskel/varlib/.keep
rename to board/common/overlay/usr/share/dataskel/varlib/.empty