diff --git a/res/menu/menu_toolbar.xml b/res/menu/menu_toolbar.xml
index 8b9117ce197f1a1c95bdb823a76a6f7948ac3160..b26cf66f8a66961a95c556294f1fb5d93f61caf2 100644
--- a/res/menu/menu_toolbar.xml
+++ b/res/menu/menu_toolbar.xml
@@ -11,7 +11,7 @@
         android:title="@string/menu_preferences"
         app:showAsAction="never" />
     <item
-        android:id="@+id/menu_show_changelog"
-        android:title="@string/menu_show_changelog"
+        android:id="@+id/menu_show_release_notes"
+        android:title="@string/menu_show_release_notes"
         app:showAsAction="never" />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6bcba24dc511c4fced16c7082b9b5652a5dae1c4..c4ce561c9102a49098a6e5287a56caaf525017cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,7 +74,7 @@
     <string name="menu_delete_update">Delete</string>
     <string name="menu_copy_url">Copy URL</string>
     <string name="menu_export_update">Export update</string>
-    <string name="menu_show_changelog">Show changelog</string>
+    <string name="menu_show_release_notes">Show release notes</string>
     <string name="menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-pie</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index b9161d090ebc10ad4d43b64b909f722d0ef5e9bb..e56d02af876189c1895be654841109417f251c6a 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -200,7 +200,7 @@ public class UpdatesActivity extends UpdatesListActivity {
                 showPreferencesDialog();
                 return true;
             }
-            case R.id.menu_show_changelog: {
+            case R.id.menu_show_release_notes: {
                 Intent openUrl = new Intent(Intent.ACTION_VIEW,
                         Uri.parse(Utils.getChangelogURL(this)));
                 startActivity(openUrl);
@@ -294,7 +294,7 @@ public class UpdatesActivity extends UpdatesListActivity {
             preferences.edit().putLong(Constants.PREF_LAST_UPDATE_CHECK, millis).apply();
             updateLastCheckedString();
             if (json.exists() && Utils.isUpdateCheckEnabled(this) &&
-                    Utils.checkForNewUpdates(json, jsonNew)) {
+                    Utils.checkForNewUpdates(jsonNew)) {
                 UpdatesCheckReceiver.updateRepeatingUpdatesCheck(this);
             }
             // In case we set a one-shot check because of a previous failure
@@ -419,7 +419,7 @@ public class UpdatesActivity extends UpdatesListActivity {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
-        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
+        autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true));
         dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true));
         abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, false));
 
diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java
index d0769cf768fa6fadfd992dfd55be474ba9ce0bfd..7626f8d360e239091d297bb6d4c48cddea5389d0 100644
--- a/src/org/lineageos/updater/UpdatesCheckReceiver.java
+++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java
@@ -93,7 +93,7 @@ public class UpdatesCheckReceiver extends BroadcastReceiver {
             @Override
             public void onSuccess(File destination) {
                 try {
-                    if (json.exists() && Utils.checkForNewUpdates(json, jsonNew)) {
+                    if (json.exists() && Utils.checkForNewUpdates(jsonNew)) {
                         showNotification(context);
                         updateRepeatingUpdatesCheck(context);
                     }
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 0df51d989701d0dd7b402293499764eb90bd90fb..87f90d83a3c7e327f888a09e43991a5692920851 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -249,12 +249,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
                 DateFormat.LONG, update.getTimestamp());
         String buildVersion = mActivity.getString(R.string.list_build_version,
-                update.getDisplayVersion());
-
-        if (buildVersion.equals("")) {
-          buildVersion = mActivity.getString(R.string.list_build_version,
-                  update.getVersion());
-        }
+                update.getVersion());
         
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
@@ -462,7 +457,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
                 DateFormat.MEDIUM, update.getTimestamp());
         String buildInfoText = mActivity.getString(R.string.list_build_version_date,
-                BuildInfoUtils.getBuildVersion(), buildDate);
+                update.getVersion(), buildDate);
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.apply_update_dialog_title)
                 .setMessage(mActivity.getString(resId, buildInfoText,
diff --git a/src/org/lineageos/updater/controller/ABUpdateInstaller.java b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
index b0be2010d40c87e84325fe922bd93aa23c20a869..4f2069bf4b7f59e7d782b611b7ace46ff00a165a 100644
--- a/src/org/lineageos/updater/controller/ABUpdateInstaller.java
+++ b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
@@ -91,7 +91,7 @@ class ABUpdateInstaller {
                     SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(
                             mContext);
                     boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES,
-                            false);
+                            true);
                     if (deleteUpdate) {
                         mUpdaterController.deleteUpdate(mDownloadId);
                     }
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 8b8289ede93bba96f810fe20c860ddbe778611a9..5a024eb622c7743250ad55da2606ff0f1b6a72f0 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -478,7 +478,7 @@ public class UpdaterService extends Service {
         String buildDate = StringGenerator.getDateLocalizedUTC(this,
                 DateFormat.MEDIUM, update.getTimestamp());
         String buildInfo = getString(R.string.list_build_version_date,
-                BuildInfoUtils.getBuildVersion(), buildDate);
+                update.getVersion(), buildDate);
         mNotificationStyle.setBigContentTitle(buildInfo);
         mNotificationBuilder.setContentTitle(buildInfo);
     }
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index 6ba705c7f6c691a653b55d31d1039236d1be70bc..979b0c0a24119b933c941fa985545e939942b6f0 100644
--- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java
@@ -34,6 +34,7 @@ public final class Constants {
     public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
     public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
     public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id";
+    public static final String PREF_FORCED_AUTO_DELETE_UPDATES = "force_auto_delete_updates";
 
     public static final String UNCRYPT_FILE_EXT = ".uncrypt";
 
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index d8022ac83cdaca60237cf556a5afdaea0721b446..c8b4ec973bb025063de716a13700a50dfc8ac5c7 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -231,24 +231,19 @@ public class Utils {
     /**
      * Compares two json formatted updates list files
      *
-     * @param oldJson old update list
      * @param newJson new update list
-     * @return true if newJson has at least a compatible update not available in oldJson
+     * @return true if newJson has an update with higher version than the installed system
      * @throws IOException
      * @throws JSONException
      */
-    public static boolean checkForNewUpdates(File oldJson, File newJson)
+    public static boolean checkForNewUpdates(File newJson)
             throws IOException, JSONException {
-        List<UpdateInfo> oldList = parseJson(oldJson, true);
         List<UpdateInfo> newList = parseJson(newJson, true);
-        Set<String> oldIds = new HashSet<>();
-        for (UpdateInfo update : oldList) {
-            oldIds.add(update.getDownloadId());
-        }
-        // In case of no new updates, the old list should
-        // have all (if not more) the updates
+        float currentVersion = Float.parseFloat(BuildInfoUtils.getBuildVersion());
+
         for (UpdateInfo update : newList) {
-            if (!oldIds.contains(update.getDownloadId())) {
+            if (Float.parseFloat(update.getVersion()) > currentVersion) {
+                Log.d(TAG, "New compatiable update available");
                 return true;
             }
         }
@@ -309,11 +304,20 @@ public class Utils {
 
         removeUncryptFiles(downloadPath);
 
+        // TODO: Remove after a considerable numbers of OTA
+        boolean forcedDeleteUpdates = preferences.getBoolean(Constants.PREF_FORCED_AUTO_DELETE_UPDATES, true);
+        if (forcedDeleteUpdates == true) {
+            preferences.edit()
+                .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true)
+                .putBoolean(Constants.PREF_FORCED_AUTO_DELETE_UPDATES, false)
+                .apply();
+        }
+
         long buildTimestamp = SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0);
         long prevTimestamp = preferences.getLong(Constants.PREF_INSTALL_OLD_TIMESTAMP, 0);
         String lastUpdatePath = preferences.getString(Constants.PREF_INSTALL_PACKAGE_PATH, null);
         boolean reinstalling = preferences.getBoolean(Constants.PREF_INSTALL_AGAIN, false);
-        boolean deleteUpdates = preferences.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false);
+        boolean deleteUpdates = preferences.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true);
         if ((buildTimestamp != prevTimestamp || reinstalling) && deleteUpdates &&
                 lastUpdatePath != null) {
             File lastUpdate = new File(lastUpdatePath);