diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 422226218fc482b86b75792568d17b0eb44c5ab6..b85f4c8044f70ed9e19420439daac752ca0f207b 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -22,20 +22,6 @@
         <org.lineageos.internal.preference.deviceinfo.LineageVersionPreference
                 android:key="lineage_version" />
 
-        <!-- System update settings - launches activity -->
-        <Preference android:key="additional_system_update_settings"
-                    android:title="@string/additional_system_update_settings_list_item_title">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="@string/additional_system_update"
-                    android:targetClass="@string/additional_system_update_menu" />
-        </Preference>
-
-        <!-- LineageOS updates -->
-        <org.lineageos.internal.preference.deviceinfo.LineageUpdatesPreference
-                android:key="lineage_updates"
-                lineage:requiresOwner="true"
-                lineage:requiresPackage="org.lineageos.updater" />
-
         <!-- Device status - launches activity -->
         <Preference android:key="status_info"
                 android:title="@string/device_status"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index b362554814586b236e0fa08dbd9ac0016985ebe3..8d50c709a05c1c33350148f66265c54207f94dc2 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -25,15 +25,7 @@
         android:order="-250"
         android:fragment="com.android.settings.gestures.GestureSettings" />
 
-    <Preference
-        android:key="additional_system_update_settings"
-        android:title="@string/additional_system_update_settings_list_item_title"
-        android:order="-31">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/additional_system_update"
-                android:targetClass="@string/additional_system_update_menu" />
-    </Preference>
-
+   
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/res/xml/system_updater_prefs.xml b/res/xml/system_updater_prefs.xml
index f84fb21f8fe41fba756876a838038c354d8c4b85..6f8c192099787853b0d20c3924111f672bbfb4b2 100644
--- a/res/xml/system_updater_prefs.xml
+++ b/res/xml/system_updater_prefs.xml
@@ -3,14 +3,12 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        android:icon="@drawable/ic_system_update"
-        android:key="system_update_settings"
-        android:order="-30"
-        android:summary="@string/summary_placeholder"
-        android:title="@string/system_update_settings_list_item_title"
-        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
-        settings:keywords="@string/keywords_system_update_settings">
-        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+        android:key="additional_system_update_settings"
+        android:title="@string/additional_system_update_settings_list_item_title"
+        android:order="-31">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="@string/additional_system_update"
+                android:targetClass="@string/additional_system_update_menu" />
     </Preference>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java
index 9b524a9b5d0d708ca95874689bc217f188cc7dc4..8c11671867b81227fc605eb75fcd3f5bc626dd0c 100644
--- a/src/com/android/settings/SystemUpdaterSettings.java
+++ b/src/com/android/settings/SystemUpdaterSettings.java
@@ -21,7 +21,8 @@ public class SystemUpdaterSettings extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS");
+        Intent intent = new Intent("android.intent.action.MAIN");
+        intent.setComponent(new ComponentName("org.lineageos.updater", "org.lineageos.updater.UpdatesActivity"));
         startActivity(intent);
 
         Activity activity = getActivity();