diff --git a/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt b/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt
index 7728882f22cfd94caf193352bf6171a3af3fe0bd..b47f95482d9dbb0fb5fd7809f9fca71929726205 100644
--- a/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/gitlab/SystemAppsUpdatesRepository.kt
@@ -96,6 +96,7 @@ class SystemAppsUpdatesRepository @Inject constructor(
 
     private fun isEligibleToFetchAppListFromTest(systemName: String) =
         systemName.isBlank() ||
+            systemName.contains("unofficial") ||
             systemName.contains("beta") ||
             systemName.contains("rc") ||
             systemName.contains("test")
@@ -182,7 +183,7 @@ class SystemAppsUpdatesRepository @Inject constructor(
     }
 
     private fun getFullSystemName(): String {
-        return SystemInfoProvider.getSystemProperty(SystemInfoProvider.KEY_LINEAGE_VERSION) ?: ""
+        return SystemInfoProvider.getSystemProperty(SystemInfoProvider.KEY_LINEAGE_VERSION)?.lowercase() ?: ""
     }
 
     private fun getSdkLevel(): Int {