diff --git a/board/common/postscript.sh b/board/common/postscript.sh
index c4c4cf5b7e..ec3d4446ed 100755
--- a/board/common/postscript.sh
+++ b/board/common/postscript.sh
@@ -28,6 +28,15 @@ ln -s /tmp $TARGET/var/run
 ln -s /tmp $TARGET/var/spool
 ln -s /tmp $TARGET/var/tmp
 
+# cleanups
 $COMMON_DIR/cleanups.sh
 test -x $BOARD_DIR/cleanups.sh && test -x $BOARD_DIR/cleanups.sh || true
 
+# board-specific os.conf
+if [ -r $BOARD_DIR/os.conf ]; then
+    for line in $(cat $BOARD_DIR/os.conf); do
+        key=$(echo $line | cut -d '=' -f 1)
+        sed -i -r "s/$key=.*/$line/" /$TARGET/etc/os.conf
+    done
+fi
+
diff --git a/board/odroidc1/os.conf b/board/odroidc1/os.conf
new file mode 100644
index 0000000000..dc77b07e6d
--- /dev/null
+++ b/board/odroidc1/os.conf
@@ -0,0 +1,2 @@
+os_tty_login="ttyS0"
+
diff --git a/board/odroidc1/overlay/etc/os.conf b/board/odroidc1/overlay/etc/os.conf
deleted file mode 100644
index e12b10ec7d..0000000000
--- a/board/odroidc1/overlay/etc/os.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-os_debug="false"
-os_prereleases="false"
-os_tty_login="ttyS0"
-os_eth="eth0"
-os_wlan="wlan0"
-os_ppp="ppp0"
-os_networkless="false"
-os_firmware_method="github"
-os_firmware_repo="ccrisan/thingos"
-os_firmware_username=""
-os_firmware_password=""
diff --git a/board/odroidc2/os.conf b/board/odroidc2/os.conf
new file mode 100644
index 0000000000..dc77b07e6d
--- /dev/null
+++ b/board/odroidc2/os.conf
@@ -0,0 +1,2 @@
+os_tty_login="ttyS0"
+
diff --git a/board/odroidc2/overlay/etc/os.conf b/board/odroidc2/overlay/etc/os.conf
deleted file mode 100644
index e12b10ec7d..0000000000
--- a/board/odroidc2/overlay/etc/os.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-os_debug="false"
-os_prereleases="false"
-os_tty_login="ttyS0"
-os_eth="eth0"
-os_wlan="wlan0"
-os_ppp="ppp0"
-os_networkless="false"
-os_firmware_method="github"
-os_firmware_repo="ccrisan/thingos"
-os_firmware_username=""
-os_firmware_password=""
diff --git a/board/pine64/os.conf b/board/pine64/os.conf
new file mode 100644
index 0000000000..dc77b07e6d
--- /dev/null
+++ b/board/pine64/os.conf
@@ -0,0 +1,2 @@
+os_tty_login="ttyS0"
+
diff --git a/board/pine64/overlay/etc/os.conf b/board/pine64/overlay/etc/os.conf
deleted file mode 100644
index e12b10ec7d..0000000000
--- a/board/pine64/overlay/etc/os.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-os_debug="false"
-os_prereleases="false"
-os_tty_login="ttyS0"
-os_eth="eth0"
-os_wlan="wlan0"
-os_ppp="ppp0"
-os_networkless="false"
-os_firmware_method="github"
-os_firmware_repo="ccrisan/thingos"
-os_firmware_username=""
-os_firmware_password=""