diff --git a/build.sh b/build.sh
index c136db8d..e0291768 100755
--- a/build.sh
+++ b/build.sh
@@ -236,12 +236,15 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/nanqinlang.patch; then
 fi
 echo "Done"
 
-echo "Checking if BBRv2 patch is set or not"
-if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
-	echo "apply..."
-	patch -N -p1 -s < ../../patches/bbr2.patch
+# Add BBR2 patch, only working on 64bits images for now
+if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then
+	echo "Checking if BBRv2 patch is set or not"
+	if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then
+		echo "apply..."
+		patch -N -p1 -s < ../../patches/bbr2.patch
+	fi
+	echo "Done"
 fi
-echo "Done"
 
 echo "Checking if smsc75xx patch is set or not"
 if ! patch -Rf -N -p1 -s --dry-run < ../../patches/smsc75xx.patch; then
diff --git a/config b/config
index 8ad8be5f..cc029c42 100644
--- a/config
+++ b/config
@@ -191,7 +191,6 @@ CONFIG_KERNEL_TCP_CONG_WESTWOOD=y
 CONFIG_KERNEL_TCP_CONG_YEAH=y
 CONFIG_KERNEL_TCP_CONG_LIA=y
 CONFIG_KERNEL_TCP_CONG_BBR=y
-CONFIG_KERNEL_TCP_CONG_BBR2=y
 CONFIG_KERNEL_TCP_CONG_NANQINLANG=y
 CONFIG_KERNEL_TCP_CONG_OLIA=y
 CONFIG_KERNEL_TCP_CONG_WVEGAS=y
diff --git a/config-bpi-r64 b/config-bpi-r64
index c2eefeed..74443ce7 100644
--- a/config-bpi-r64
+++ b/config-bpi-r64
@@ -7,3 +7,4 @@ CONFIG_PACKAGE_uboot-mediatek=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_mt7622-preloader=y
 CONFIG_KERNEL_ARM64_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/config-espressobin b/config-espressobin
new file mode 100644
index 00000000..ed5b4188
--- /dev/null
+++ b/config-espressobin
@@ -0,0 +1,9 @@
+CONFIG_TARGET_mvebu=y
+CONFIG_TARGET_mvebu_cortexa53=y
+CONFIG_TARGET_mvebu_cortexa53_DEVICE_globalscale_espressobin-v7=y
+CONFIG_PACKAGE_kmod-6lowpan=y
+CONFIG_PACKAGE_luci-app-advanced-reboot=y
+# CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set
+CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KERNEL_ARM_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/config-r2s b/config-r2s
index af12d580..32b989e7 100644
--- a/config-r2s
+++ b/config-r2s
@@ -3,3 +3,4 @@ CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
 CONFIG_PACKAGE_kmod-6lowpan=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/config-rpi3 b/config-rpi3
new file mode 100644
index 00000000..70db978f
--- /dev/null
+++ b/config-rpi3
@@ -0,0 +1,7 @@
+CONFIG_TARGET_bcm27xx=y
+CONFIG_TARGET_bcm27xx_bcm2710=y
+CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
+CONFIG_PACKAGE_kmod-ath10k-ct=n
+CONFIG_PACKAGE_kmod-ath9k=y
+CONFIG_KERNEL_ARM_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/config-rpi4 b/config-rpi4
index 673501f4..c2840279 100644
--- a/config-rpi4
+++ b/config-rpi4
@@ -6,3 +6,4 @@ CONFIG_PACKAGE_kmod-ath9k=y
 CONFIG_PACKAGE_bcm27xx-eeprom=y
 CONFIG_PACKAGE_bcm27xx-userland=y
 CONFIG_KERNEL_ARM64_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR2=y
diff --git a/config-x86_64 b/config-x86_64
index 25699d13..78b1a42c 100644
--- a/config-x86_64
+++ b/config-x86_64
@@ -9,3 +9,4 @@ CONFIG_PACKAGE_kmod-ath9k=y
 CONFIG_GRUB_IMAGES=y
 CONFIG_EFI_IMAGES=y
 # CONFIG_VMDK_IMAGES is not set
+CONFIG_KERNEL_TCP_CONG_BBR2=y