diff --git a/app/Cargo.toml b/app/Cargo.toml
index ef14df0e28..d02e74b55b 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -631,6 +631,10 @@ default = [
     "configurable_context_window",
     "oz_handoff",
     "handoff_local_cloud",
+    "orchestration_v2",
+    "orchestration_pill_bar",
+    "orchestration_viewer_pill_bar",
+    "run_agents_tool",
     "pending_user_query_indicator",
 ]
 # Enable this feature to automatically perform heap profiling.  NOTE: This will
@@ -912,6 +916,8 @@ incremental_auto_reload = []
 orchestration = []
 orchestration_v2 = ["orchestration"]
 orchestration_pill_bar = []
+orchestration_viewer_pill_bar = []
+run_agents_tool = []
 pending_user_query_indicator = []
 queue_slash_command = []
 inline_menu_headers = []
diff --git a/app/src/lib.rs b/app/src/lib.rs
index 37a31ef054..ee9a1b1025 100644
--- a/app/src/lib.rs
+++ b/app/src/lib.rs
@@ -2907,6 +2907,10 @@ pub fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::OrchestrationV2,
         #[cfg(feature = "orchestration_pill_bar")]
         FeatureFlag::OrchestrationPillBar,
+        #[cfg(feature = "orchestration_viewer_pill_bar")]
+        FeatureFlag::OrchestrationViewerPillBar,
+        #[cfg(feature = "run_agents_tool")]
+        FeatureFlag::RunAgentsTool,
         #[cfg(feature = "pending_user_query_indicator")]
         FeatureFlag::PendingUserQueryIndicator,
         #[cfg(feature = "queue_slash_command")]
diff --git a/crates/warp_features/src/lib.rs b/crates/warp_features/src/lib.rs
index 124e76021e..a08a6db149 100644
--- a/crates/warp_features/src/lib.rs
+++ b/crates/warp_features/src/lib.rs
@@ -939,7 +939,6 @@ pub const DOGFOOD_FLAGS: &[FeatureFlag] = &[
     FeatureFlag::ConversationApi,
     FeatureFlag::RememberFastForwardState,
     FeatureFlag::HOANotifications,
-    FeatureFlag::OrchestrationViewerPillBar,
     FeatureFlag::GeminiNotifications,
     FeatureFlag::LocalDockerSandbox,
     FeatureFlag::CloudModeSetupV2,
@@ -958,11 +957,6 @@ pub const DOGFOOD_FLAGS: &[FeatureFlag] = &[
 /// Features enabled for feature preview build users (e.g.: Friends of Warp).
 /// All PREVIEW_FLAGS are also automatically added to dogfood builds (WarpDev).
 pub const PREVIEW_FLAGS: &[FeatureFlag] = &[
-    FeatureFlag::Orchestration,
-    FeatureFlag::OrchestrationV2,
-    FeatureFlag::OrchestrationPillBar,
-    FeatureFlag::OrchestrationViewerPillBar,
-    FeatureFlag::RunAgentsTool,
     FeatureFlag::BlocklistMarkdownTableRendering,
     FeatureFlag::MarkdownTables,
     FeatureFlag::GitOperationsInCodeReview,