diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index 40ab92bada2969c4a55afc5397cf4974899d8172..20aa94f1eaf625b7f36ac960447914ed358fed9a 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -18,4 +18,6 @@
     <string name="e_really_remove_account_message">If you remove this account you will not be able to access its data from this device anymore including its emails. You can add it back whenever you want.</string>
     <string name="e_auto_sync_account_title">Auto-refresh contents</string>
     <string name="e_auto_sync_account_summary">Allow apps to automatically refresh contents in the background</string>
+
+    <string name="e_developer_options">/e/OS developer options</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index e5062c677bb8984b0adee5cca8ce7d1b9d9ec973..920b023296d5f03c4a883a0e7a40a01d3acf0934 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -130,6 +130,30 @@
             android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="e_developer_options"
+        android:title="@string/e_developer_options"
+        android:order="199">
+
+        <SwitchPreference
+            android:key="change_update_source"
+            android:title="@string/title_ota_server"
+            android:summary="@string/use_ota_summary" />
+
+        <SwitchPreference
+            android:key="enable_telemetry"
+            android:title="@string/enable_telemetry"
+            android:summary="@string/telemetry_details" />
+
+        <Preference
+            android:key="sentry_userid"
+            android:title="@string/sentry_userid_title"
+            android:summary="@string/summary_placeholder"
+            android:selectable="false"
+            settings:enableCopying="true"
+            settings:controller="com.android.settings.deviceinfo.firmwareversion.SentryDetailPreferenceController"/>
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="debug_debugging_category"
         android:title="@string/debug_debugging_category"
@@ -645,24 +669,6 @@
         <Preference
             android:key="reset_shortcut_manager_throttling"
             android:title="@string/reset_shortcut_manager_throttling" />
-
-        <SwitchPreference
-            android:key="change_update_source"
-            android:title="@string/title_ota_server"
-            android:summary="@string/use_ota_summary" />
-
-        <SwitchPreference
-            android:key="enable_telemetry"
-            android:title="@string/enable_telemetry"
-            android:summary="@string/telemetry_details" />
-
-        <Preference
-            android:key="sentry_userid"
-            android:title="@string/sentry_userid_title"
-            android:summary="@string/summary_placeholder"
-            android:selectable="false"
-            settings:enableCopying="true"
-            settings:controller="com.android.settings.deviceinfo.firmwareversion.SentryDetailPreferenceController"/>
     </PreferenceCategory>
 
     <com.android.settings.development.autofill.AutofillPreferenceCategory