diff --git a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
index 6584c04d49934e78358e06bb624564f4f14d2522..081b8d976d7ec62718fc327b1c1b6c2ac5a3cb5b 100644
--- a/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
+++ b/app/src/main/java/org/lineageos/updater/UpdaterReceiver.java
@@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.StringGenerator;
-import org.lineageos.updater.misc.Utils;
 
 import java.text.DateFormat;
 
@@ -62,7 +61,7 @@ public class UpdaterReceiver extends BroadcastReceiver {
         String buildDate = StringGenerator.getDateLocalizedUTC(context,
                 DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0));
         String buildInfo = context.getString(R.string.list_build_version_date_e,
-                Utils.getDisplayVersion(BuildInfoUtils.getBuildVersion()), buildDate);
+                BuildInfoUtils.getBuildVersion(), buildDate);
 
         Intent notificationIntent = new Intent(context, UpdatesActivity.class);
         PendingIntent intent = PendingIntent.getActivity(context, 0, notificationIntent,
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
index 1161a82bdb966ecd8c64d02620664af038c38d43..181d0871a78bf599ede6db675bcaf0406935eee0 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
@@ -175,7 +175,7 @@ public class UpdatesActivity extends UpdatesListActivity {
 
         TextView headerTitle = findViewById(R.id.header_title);
         headerTitle.setText(getString(R.string.header_title_text_e,
-                Utils.getDisplayVersion(BuildInfoUtils.getDisplayVersion())));
+                BuildInfoUtils.getDisplayVersion()));
 
         updateLastCheckedString();
 
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
index 775584f4fb861c4f1e8286015b6a3b08533d390f..8f42f62eb43264ebe5336cf524b5be4514dd9076 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java
@@ -271,11 +271,12 @@ 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_e,
-                Utils.getDisplayVersion(update.getVersion()));
+                update.getVersion());
 
-        if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
+        if (!Build.VERSION.RELEASE.equals(update.getAndroidVersion())) {
             viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
         }
+
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -526,7 +527,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                     mActivity.getString(
                             R.string.list_build_version_date, update.getVersion(), buildDate);
 
-            if (update.getAndroidVersion().equals(Build.VERSION.RELEASE)) {
+            if (Build.VERSION.RELEASE.equals(update.getAndroidVersion())) {
                 title = R.string.apply_update_dialog_title;
                 if (Utils.isABUpdate(update.getFile())) {
                     message =
diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
index a215267cd280e84fc77de50028e9f397454356c2..eec811b698e0cee1fbb74b87d5a52f6b4e1c48fc 100644
--- a/app/src/main/java/org/lineageos/updater/misc/Utils.java
+++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java
@@ -68,7 +68,9 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.UUID;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -129,11 +131,20 @@ public class Utils {
         return update;
     }
 
+    public static int parseAndroidVersion(String versionString) {
+        // Parse android versions such as 8.1.0.
+        // Older updates still shows in ota requests.
+        Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)");
+        Matcher matcher = pattern.matcher(versionString);
+        return matcher.matches() ? Integer.parseInt(Objects.requireNonNull(matcher.group(1)))
+                : Float.valueOf(versionString).intValue();
+    }
+
     public static boolean isCompatible(UpdateBaseInfo update) {
         String updateAndroidVersion = update.getAndroidVersion();
         if (!updateAndroidVersion.isEmpty()) {
-            final int updateOSVersion = Float.valueOf(updateAndroidVersion).intValue();
-            final int deviceOSVersion = Float.valueOf(Build.VERSION.RELEASE).intValue();
+            final int updateOSVersion = parseAndroidVersion(updateAndroidVersion);
+            final int deviceOSVersion = parseAndroidVersion(Build.VERSION.RELEASE);
             if (deviceOSVersion > updateOSVersion) {
                     Log.d(TAG, "Update : Skipping " + update.getName() + " since the installed version "
                             + deviceOSVersion + " is newer than update " + updateOSVersion);
@@ -335,9 +346,11 @@ public class Utils {
                 int[] updateVersionParts = parseSemVer(update.getVersion());
                 int updateMajorVersion = updateVersionParts[0];
                 int updateMinorVersion = updateVersionParts[1];
-                int updateMaintenanceVersion = updateVersionParts.length > 2 ? updateVersionParts[2] : 0;
-				float thisUpdate = Float.parseFloat(updateMajorVersion + "." + updateMinorVersion);
-				if (updateMajorVersion*10000+updateMinorVersion*100+updateMaintenanceVersion >= highestMajorVersion*10000+highestMinorVersion*100+highestMaintenanceVersion) {
+                int updateMaintenanceVersion = updateVersionParts.length > 2
+                        ? updateVersionParts[2] : 0;
+                if (updateMajorVersion * 10000 + updateMinorVersion * 100 + updateMaintenanceVersion
+                        >= highestMajorVersion * 10000 + highestMinorVersion * 100
+                        + highestMaintenanceVersion) {
                     highestMajorVersion = updateMajorVersion;
                     highestMinorVersion = updateMinorVersion;
 					highestMaintenanceVersion = updateMaintenanceVersion;
@@ -345,11 +358,13 @@ public class Utils {
 				hasUpdate = true;
             }
         }
+        String updateVersion = highestMajorVersion + "." + highestMinorVersion +
+                (highestMaintenanceVersion > 0 ? "." + highestMaintenanceVersion : "");
         if (hasUpdate) {
-           updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, highestMajorVersion + "." + highestMinorVersion + (highestMaintenanceVersion > 0 ? "." + highestMaintenanceVersion : ""));
+           updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, updateVersion);
            return true;
         } else {
-           updateSystemUpdaterService(context, STATUS_IDLE, highestMajorVersion+"."+highestMinorVersion+(highestMaintenanceVersion > 0 ? "." + highestMaintenanceVersion : ""));
+           updateSystemUpdaterService(context, STATUS_IDLE, updateVersion);
            return false;
         }
     }
@@ -575,15 +590,4 @@ public class Utils {
             updateManager.updateSystemUpdateInfo(infoBundle);
         }
     }
-
-    public static String getDisplayVersion(String version) {
-        float floatVersion = 0;
-        try {
-            floatVersion = Float.parseFloat(version);
-        } catch (NumberFormatException ignored) {
-            // ignore
-        }
-        // Lineage 20 and up should only be integer values (we don't have minor versions anymore)
-        return (floatVersion >= 20) ? String.valueOf((int)floatVersion) : version;
-    }
 }