diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
index 2fc3a73bd3..18e572cbef 100644
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
@@ -16,9 +16,7 @@
 #include "PowershellCoreProfileGenerator.h"
 #include "VisualStudioGenerator.h"
 #include "WslDistroGenerator.h"
-#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
 #include "SshHostGenerator.h"
-#endif
 
 #include "ApplicationState.h"
 #include "DefaultTerminal.h"
@@ -226,9 +224,10 @@ void SettingsLoader::GenerateProfiles()
     generateProfiles(WslDistroGenerator{});
     generateProfiles(AzureCloudShellGenerator{});
     generateProfiles(VisualStudioGenerator{});
-#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
-    sshProfilesGenerated = generateProfiles(SshHostGenerator{});
-#endif
+    if constexpr (Feature_DynamicSSHProfiles::IsEnabled())
+    {
+        sshProfilesGenerated = generateProfiles(SshHostGenerator{});
+    }
 }
 
 // Generate ExtensionPackage objects from the profile generators.
@@ -267,9 +266,10 @@ void SettingsLoader::GenerateExtensionPackagesFromProfileGenerators()
     generateExtensionPackages(WslDistroGenerator{});
     generateExtensionPackages(AzureCloudShellGenerator{});
     generateExtensionPackages(VisualStudioGenerator{});
-#if TIL_FEATURE_DYNAMICSSHPROFILES_ENABLED
-    generateExtensionPackages(SshHostGenerator{});
-#endif
+    if constexpr (Feature_DynamicSSHProfiles::IsEnabled())
+    {
+        generateExtensionPackages(SshHostGenerator{});
+    }
 }
 
 // A new settings.json gets a special treatment:
diff --git a/src/features.xml b/src/features.xml
index 9b115a0c06..7269ccec0a 100644
--- a/src/features.xml
+++ b/src/features.xml
@@ -99,24 +99,16 @@
         <name>Feature_DynamicSSHProfiles</name>
         <description>Enables the dynamic profile generator for OpenSSH config files</description>
         <id>9031</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
         <name>Feature_ShellCompletions</name>
         <description>An experimental escape sequence for client applications to request the Terminal display a list of suggestions.</description>
         <id>3121</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
@@ -165,24 +157,16 @@
         <name>Feature_SaveSnippet</name>
         <description>Save Snippet</description>
         <id>9971</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
         <name>Feature_QuickFix</name>
         <description>Enables the Quick Fix menu</description>
         <id>16599</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
@@ -192,15 +176,4 @@
         <alwaysDisabledReleaseTokens/>
     </feature>
 
-    <feature>
-        <name>Feature_DisableWebSourceIcons</name>
-        <description>Disables icon paths that make web requests</description>
-        <id>19075</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-        </alwaysEnabledBrandingTokens>
-    </feature>
-
 </featureStaging>
diff --git a/tools/Generate-FeatureStagingHeader.ps1 b/tools/Generate-FeatureStagingHeader.ps1
index cc78685b8b..527d20fcb2 100644
--- a/tools/Generate-FeatureStagingHeader.ps1
+++ b/tools/Generate-FeatureStagingHeader.ps1
@@ -89,11 +89,11 @@ Function Resolve-FinalFeatureStage {
         [string]$Branding
     )
 
-    # RELEASE=DISABLED wins all checks
+    # RELEASE=DISABLED wins all checks (WindowsInbox counts as a type of Release)
     # Then, branch match by most-specific branch
     # Then, branding type (if no overriding branch match)
 
-    If ($Branding -Eq "Release" -And $Feature.DisabledReleaseToken) {
+    If ($Branding -In @("Release", "WindowsInbox") -And $Feature.DisabledReleaseToken) {
         [Stage]::AlwaysDisabled
         Return
     }