diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index d51cb951f50a07c4dd448102860fac4ef0921a92..2f8dfa8140cf02c2d94992b95c5dc1f10e0f5d72 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -60,4 +60,6 @@
     <string name="e_version_pending_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update available</string>
     <string name="e_version_in_progress_update_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - update in progress</string>
     <string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</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 12828e39dbc9bb948b6c8b9bc3ccaf45f32963ff..1c1a0bce4c51df29db62c31e385ee0296b64fe61 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -127,6 +127,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"
@@ -670,23 +694,6 @@
             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>
 
     <PreferenceCategory