diff --git a/proto/bos/v1/performance.proto b/proto/bos/v1/performance.proto
index 70627dc..134e9f1 100644
--- a/proto/bos/v1/performance.proto
+++ b/proto/bos/v1/performance.proto
@@ -51,6 +51,13 @@ message TunerConstraints {
   braiins.bos.v1.HashrateConstraints hashrate_target = 2;
 }
 
+message DPSShutdownEnabled {
+  // Dynamic Performance Scaling shutdown duration
+  braiins.bos.v1.Hours shutdown_duration = 7;
+}
+
+message DPSShutdownDisabled {}
+
 message DPSConfiguration {
   // Flag if Dynamic Performance Scaling is enabled
   optional bool enabled = 1;
@@ -62,10 +69,13 @@ message DPSConfiguration {
   braiins.bos.v1.Power min_power_target = 4;
   // Dynamic Performance Scaling minimal hashrate target
   braiins.bos.v1.TeraHashrate min_hashrate_target = 5;
-  // Flag if shutdown for Dynamic Performance Scaling is enabled
-  optional bool shutdown_enabled = 6;
-  // Dynamic Performance Scaling shutdown duration
-  braiins.bos.v1.Hours shutdown_duration = 7;
+  // Dynamic Performance Scaling shudown mode
+  oneof shutdown_mode {
+    // Dynamic Performance Scaling shutdown enabled
+    DPSShutdownEnabled enabled = 6;
+    // Dynamic Performance Scaling shutdown enabled
+    DPSShutdownDisabled disabled = 7;
+  }
 }
 
 message HashboardPerformanceConfiguration {
@@ -271,9 +281,12 @@ message SetDPSRequest {
   // Flag if Dynamic Performance Scaling should be enabled
   optional bool enable = 2;
   // Flag if shutdown for Dynamic Performance Scaling should be enabled
-  optional bool enable_shutdown = 3;
-  // Dynamic Performance Scaling shutdown duration
-  optional braiins.bos.v1.Hours shutdown_duration = 4;
+  oneof shutdown_mode {
+    // Dynamic Performance Scaling shutdown enabled
+    DPSShutdownEnabled enabled = 3;
+    // Dynamic Performance Scaling shutdown enabled
+    DPSShutdownDisabled disabled = 4;
+  }
   // Dynamic Performance Scaling target
   DPSTarget target = 5;
 }