diff --git a/Makefile b/Makefile
index d5bfb1d00..4763aa787 100644
--- a/Makefile
+++ b/Makefile
@@ -255,6 +255,9 @@ endif
 
 ifeq ($(TARGET),$(filter $(TARGET), $(CC3D_TARGETS)))
 TARGET_FLAGS := $(TARGET_FLAGS) -DCC3D 
+ifeq ($(TARGET),CC3D_OPBL)
+TARGET_FLAGS := $(TARGET_FLAGS) -DCC3D_OPBL
+endif
 TARGET_DIR = $(ROOT)/src/main/target/CC3D
 endif
 
diff --git a/src/main/drivers/pwm_mapping.h b/src/main/drivers/pwm_mapping.h
index 9d8377f17..ec8e05ce3 100644
--- a/src/main/drivers/pwm_mapping.h
+++ b/src/main/drivers/pwm_mapping.h
@@ -70,11 +70,11 @@ typedef struct drv_pwm_config_s {
 #ifdef USE_SERVOS
     bool useServos;
     bool useChannelForwarding;    // configure additional channels as servos
-#ifdef CC3D
-    bool useBuzzerP6;
-#endif
     uint16_t servoPwmRate;
     uint16_t servoCenterPulse;
+#endif
+#ifdef CC3D
+    bool useBuzzerP6;
 #endif
     bool airplane;       // fixed wing hardware config, lots of servos etc
     uint16_t motorPwmRate;
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 312f69223..976b8f234 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -128,11 +128,15 @@
 #define SERIAL_RX
 #define USE_SERVOS
 #define USE_CLI
-//#define SONAR
+#define SONAR
 //#define GPS
 
 #undef BARO
 
+#ifdef CC3D_OPBL
 #define SKIP_CLI_COMMAND_HELP
 #define SKIP_PID_LUXFLOAT
+#undef SONAR
+#undef GPS
+#endif