diff --git a/src/main/build/version.h b/src/main/build/version.h
index 32b64ce868..2d4f19f946 100644
--- a/src/main/build/version.h
+++ b/src/main/build/version.h
@@ -26,6 +26,9 @@
 
 #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
 
+// Uncomment this for release / maintenance branches, or use `OPTIONS=RELEASE_BUILD`
+//#define RELEASE_BUILD
+
 extern const char* const targetName;
 
 #define GIT_SHORT_REVISION_LENGTH   7 // lower case hexadecimal digits.
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index caf3903c44..85c607fb2d 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -25,6 +25,8 @@
 #define BEEPER                  PB3
 #define BEEPER_INVERTED
 
+#define USE_DSHOT_DMAR
+
 // ICM20689 interrupt
 #define USE_EXTI
 #define MPU_INT_EXTI            PA8
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index 54fad983f8..f14e82d19c 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -25,6 +25,8 @@
 #define BEEPER                  PC13
 #define BEEPER_INVERTED
 
+#define USE_DSHOT_DMAR
+
 #define INVERTER_PIN_UART2      PC14
 
 #define USE_ACC
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 4b99833006..bc65cf48e0 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -53,6 +53,10 @@
 #define BEEPER                  PB4
 #define BEEPER_INVERTED
 
+#if defined(OMNIBUSF4SD)
+#define USE_DSHOT_DMAR
+#endif
+
 #ifdef OMNIBUSF4SD
 // These inverter control pins collide with timer channels on CH5 and CH6 pads.
 // Users of these timers/pads must un-map the inverter assignment explicitly.
diff --git a/src/main/target/common_fc_post.h b/src/main/target/common_fc_post.h
index ac6b25aba4..69fa6442c2 100644
--- a/src/main/target/common_fc_post.h
+++ b/src/main/target/common_fc_post.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include "build/version.h"
+
 // Targets with built-in vtx do not need external vtx
 #if defined(VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
 #undef VTX_SMARTAUDIO
@@ -79,3 +81,12 @@
 #define USE_RX_FRSKY_SPI
 #endif
 
+#if !defined(STM32F1) && defined(USE_DSHOT)
+#if !defined(USE_DSHOT_DMA) && !defined(USE_DSHOT_DMAR)
+#if !defined(RELEASE_BUILD)
+#define USE_DSHOT_DMAR
+#endif // !RELEASE_BUILD
+#endif // !USE_DSHOT_DMA && !USE_DSHOT_DMAR
+#endif // !STM32F1 && !STM32F3
+#undef USE_DSHOT_DMA
+
diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h
index 15e42e28f8..102bdd7b46 100644
--- a/src/main/target/common_fc_pre.h
+++ b/src/main/target/common_fc_pre.h
@@ -46,7 +46,6 @@
 
 #ifdef STM32F4
 #define USE_DSHOT
-#define USE_DSHOT_DMAR
 #define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
 #define USE_TELEMETRY_IBUS
@@ -58,7 +57,6 @@
 #endif
 #ifdef STM32F7
 #define USE_DSHOT
-#define USE_DSHOT_DMAR
 #define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
 #define I2C4_OVERCLOCK true