diff --git a/buildroot-external/configs/generic_aarch64_defconfig b/buildroot-external/configs/generic_aarch64_defconfig
index 8aec679d5..b18a4866d 100644
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -122,6 +122,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="GenericAarch64"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig
index aa07ac62c..d99c3ead6 100644
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -123,6 +123,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="amd64"
 BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="GenericAmd64"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig
index ef0d2c3da..ee303ef43 100644
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -111,9 +111,10 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/boa
 BR2_PACKAGE_GASKET=y
 BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
+BR2_PACKAGE_HASSIO_MACHINE="khadas-vim3"
 BR2_PACKAGE_KHADAS_BOOT=y
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="KhadasVim3"
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
 BR2_PACKAGE_HOST_TEMPIO=y
diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig
index 738789e41..e661f9166 100644
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -113,6 +113,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c2"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="OdroidC2"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2=y
diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig
index d8a3dddab..2a1ae2f7c 100644
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -112,6 +112,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-c4"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="OdroidC4"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4=y
diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig
index 7fc94c9a0..991a96612 100644
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-n2"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="OdroidN2"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2=y
diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig
index cc23298aa..ad9b5b1e5 100644
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -116,6 +116,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="odroid-xu"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="OdroidXu"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
 BR2_PACKAGE_RTL8821CU=y
diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index f1e7c88f3..be5bbd991 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -122,6 +122,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="amd64"
 BR2_PACKAGE_HASSIO_MACHINE="qemux86-64"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="Ova"
 BR2_PACKAGE_QEMU_GUEST_AGENT=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RTL88X2BU=y
diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index 1e5e16b67..aa3e0e366 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -115,6 +115,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi2"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi2"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_HOST_TEMPIO=y
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
index 670bc504c..2db504ab6 100644
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -117,6 +117,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3-64"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi3"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
index 4215dc479..cca318165 100644
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -118,6 +118,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi3"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi3"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig
index 64730dc8c..ce2ef6fc4 100644
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -119,6 +119,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4-64"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi4"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig
index f9a1fb4f6..56da0be44 100644
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -117,6 +117,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="raspberrypi4"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="RaspberryPi4"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig
index 85a320fe8..1ed28cf98 100644
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -119,6 +119,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_HASSIO_MACHINE="tinker"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="Tinker"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER=y
diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig
index dad1b8986..1218955f2 100644
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -118,6 +118,7 @@ BR2_PACKAGE_HASSIO=y
 BR2_PACKAGE_HASSIO_ARCH="aarch64"
 BR2_PACKAGE_HASSIO_MACHINE="yellow"
 BR2_PACKAGE_OS_AGENT=y
+BR2_PACKAGE_OS_AGENT_BOARD="Yellow"
 BR2_PACKAGE_PI_BLUETOOTH=y
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
diff --git a/buildroot-external/package/os-agent/Config.in b/buildroot-external/package/os-agent/Config.in
index db98507b3..52d27216b 100644
--- a/buildroot-external/package/os-agent/Config.in
+++ b/buildroot-external/package/os-agent/Config.in
@@ -2,3 +2,12 @@ config BR2_PACKAGE_OS_AGENT
 	bool "Home Assistant OS Agent"
 	help
 	  Install the Home Assistant OS Agent
+
+if BR2_PACKAGE_OS_AGENT
+
+config BR2_PACKAGE_OS_AGENT_BOARD
+	string "OS-Agent board"
+	help
+	  OS Agent board feature which should be pull.
+
+endif
diff --git a/buildroot-external/package/os-agent/os-agent.mk b/buildroot-external/package/os-agent/os-agent.mk
index e448de4b3..b256a346c 100644
--- a/buildroot-external/package/os-agent/os-agent.mk
+++ b/buildroot-external/package/os-agent/os-agent.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-OS_AGENT_VERSION = 1.3.0
+OS_AGENT_VERSION = 1.4.1
 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
 OS_AGENT_LICENSE = Apache License 2.0
 OS_AGENT_LICENSE_FILES = LICENSE
 OS_AGENT_GOMOD = github.com/home-assistant/os-agent
-OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION)
+OS_AGENT_LDFLAGS = -X main.version=$(OS_AGENT_VERSION) -X main.board=$(BR2_PACKAGE_OS_AGENT_BOARD)
 
 define OS_AGENT_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 0644 $(@D)/contrib/io.hass.conf \