diff --git a/blink/src/main/cpp/blink.cpp b/blink/src/main/cpp/blink.cpp
index e0fa7e9..d0360c4 100644
--- a/blink/src/main/cpp/blink.cpp
+++ b/blink/src/main/cpp/blink.cpp
@@ -37,10 +37,9 @@ const int BLINK_INTERVAL_MS = 1000;
 void android_main(android_app* app) {
     AndroidSystemProperties systemProperties(app->activity);
     const char* LED_GPIO;
-    if (systemProperties.getBuildDevice() == "rpi3") {
+    if (systemProperties.getBuildDevice() == "rpi3" ||
+        systemProperties.getBuildDevice() == "rpi3bp") {
         LED_GPIO = "BCM6";
-    } else if (systemProperties.getBuildDevice() == "imx6ul_pico") {
-        LED_GPIO = "GPIO4_IO22";
     } else if (systemProperties.getBuildDevice() == "imx7d_pico") {
         LED_GPIO = "GPIO2_IO02";
     } else {
diff --git a/button/src/main/cpp/button.cpp b/button/src/main/cpp/button.cpp
index 242d607..65ea42b 100644
--- a/button/src/main/cpp/button.cpp
+++ b/button/src/main/cpp/button.cpp
@@ -37,10 +37,9 @@ const char* TAG = "button";
 void android_main(android_app* app) {
     AndroidSystemProperties systemProperties(app->activity);
     const char* BUTTON_GPIO;
-    if (systemProperties.getBuildDevice() == "rpi3") {
+    if (systemProperties.getBuildDevice() == "rpi3" ||
+        systemProperties.getBuildDevice() == "rpi3bp") {
         BUTTON_GPIO = "BCM21";
-    } else if (systemProperties.getBuildDevice() == "imx6ul_pico") {
-        BUTTON_GPIO = "GPIO2_IO03";
     } else if (systemProperties.getBuildDevice() == "imx7d_pico") {
         BUTTON_GPIO = "GPIO6_IO14";
     }  else {
diff --git a/speaker/src/main/cpp/speaker.cpp b/speaker/src/main/cpp/speaker.cpp
index 001ac94..c6ff391 100644
--- a/speaker/src/main/cpp/speaker.cpp
+++ b/speaker/src/main/cpp/speaker.cpp
@@ -45,10 +45,9 @@ int64_t millis() {
 void android_main(android_app* app) {
     AndroidSystemProperties systemProperties(app->activity);
     const char* SPEAKER_PWM;
-    if (systemProperties.getBuildDevice() == "rpi3") {
+    if (systemProperties.getBuildDevice() == "rpi3" ||
+        systemProperties.getBuildDevice() == "rpi3bp") {
         SPEAKER_PWM = "PWM1";
-    } else if (systemProperties.getBuildDevice() == "imx6ul_pico") {
-        SPEAKER_PWM = "PWM8";
     } else if (systemProperties.getBuildDevice() == "imx7d_pico") {
         SPEAKER_PWM = "PWM2";
     } else {