diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7826a54dddb5a97711d5d5de396a16dd0f8c6edc..e8788295845f8167a080b7639db88b75aa12fce6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:master
+image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:java21
 
 variables:
   SENTRY_DSN: $SENTRY_DSN
diff --git a/app/build.gradle b/app/build.gradle
index c2547c6e75bb983e78c0c6bc396ad277f10d6547..0b1994390dd5d5ab723fffbfbc4bcadc0bf91ea2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -206,11 +206,11 @@ android {
         aidl = true
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '21'
     }
     lint {
         lintConfig = file('lint.xml')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cce4b11c286be2bcf810c08cc655a72807a746b4..ad4d645642a2ea1038ea2babfb36e4ed903291a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -161,11 +161,6 @@
             android:exported="true"
             android:readPermission="${applicationId}.permission.PROVIDER_READ" />
 
-        <service
-            android:name=".install.pkg.PackageInstallerService"
-            android:foregroundServiceType="dataSync">
-        </service>
-
         <!-- TODO: ExportedService, suppressing because changes are needed in other apps -->
         <service
             android:name=".install.splitinstall.SplitInstallService"
diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
index c84e5845f329736575f749ad7e1920ec3d1e0213..2a55f4c82768e2ec82a1b8356989de8d6852d65a 100644
--- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
+++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreRepository.kt
@@ -19,6 +19,7 @@
 package foundation.e.apps.data.playstore
 
 import android.content.Context
+import android.os.Build
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.gplayapi.data.models.App as GplayApp
 import com.aurora.gplayapi.data.models.Category
@@ -45,6 +46,7 @@ import foundation.e.apps.data.application.utils.toApplication
 import foundation.e.apps.data.enums.Source
 import foundation.e.apps.data.login.AuthenticatorRepository
 import foundation.e.apps.data.playstore.utils.GPlayHttpClient
+import foundation.e.apps.utils.SystemInfoProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -148,13 +150,17 @@ class PlayStoreRepository @Inject constructor(
             appDetails = appDetailsHelper.getAppByPackageName(packageName)
         }
 
-        if (appDetails?.versionCode == 0) {
+        if (!isEmulator() && appDetails?.versionCode == 0) {
             throw IllegalStateException("App version code cannot be 0")
         }
 
         return appDetails?.toApplication(context) ?: Application()
     }
 
+    private fun isEmulator(): Boolean {
+        return SystemInfoProvider.getSystemProperty("ro.boot.qemu").equals("1")
+    }
+
     private fun getCategoryType(type: CategoryType): Category.Type {
         return if (type == CategoryType.APPLICATION) Category.Type.APPLICATION
         else Category.Type.GAME
diff --git a/app/src/main/java/foundation/e/apps/data/playstore/utils/CustomAuthValidator.kt b/app/src/main/java/foundation/e/apps/data/playstore/utils/CustomAuthValidator.kt
index 4850ac7562c2bd5a43554a8ea5b46245f79e2c7d..e029c196e32685470aeef02d021a98d7456fd1cd 100644
--- a/app/src/main/java/foundation/e/apps/data/playstore/utils/CustomAuthValidator.kt
+++ b/app/src/main/java/foundation/e/apps/data/playstore/utils/CustomAuthValidator.kt
@@ -21,7 +21,6 @@ import com.aurora.gplayapi.GooglePlayApi
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.PlayResponse
 import com.aurora.gplayapi.data.providers.HeaderProvider
-import com.aurora.gplayapi.helpers.AuthValidator
 import com.aurora.gplayapi.helpers.NativeHelper
 import com.aurora.gplayapi.network.IHttpClient
 
diff --git a/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt b/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt
deleted file mode 100644
index ae0e59633dcc7df00585c4191aa7d1adfd9a17b1..0000000000000000000000000000000000000000
--- a/app/src/main/java/foundation/e/apps/install/pkg/PackageInstallerService.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Apps  Quickly and easily install Android apps onto your device!
- * Copyright (C) 2021  E FOUNDATION
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package foundation.e.apps.install.pkg
-
-import android.app.Service
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import android.os.IBinder
-import dagger.hilt.android.AndroidEntryPoint
-import foundation.e.apps.data.enums.Status
-import foundation.e.apps.data.install.AppManagerWrapper
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-@DelicateCoroutinesApi
-class PackageInstallerService : Service() {
-
-    @Inject
-    lateinit var appManagerWrapper: AppManagerWrapper
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -69)
-        val packageName = intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)
-        val extra = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
-
-        if (packageName != null) {
-            if (status == PackageInstaller.STATUS_SUCCESS) {
-                updateDownloadStatus(packageName)
-            } else {
-                Timber.e("Installation failed due to error: $extra")
-                updateInstallationIssue(packageName)
-            }
-        }
-
-        stopSelf()
-        return START_NOT_STICKY
-    }
-
-    override fun onBind(intent: Intent): IBinder? {
-        return null
-    }
-
-    // TODO: FIND A BETTER WAY TO DO THIS
-    private fun updateDownloadStatus(pkgName: String) {
-        GlobalScope.launch {
-            val fusedDownload = appManagerWrapper.getFusedDownload(packageName = pkgName)
-            appManagerWrapper.updateDownloadStatus(fusedDownload, Status.INSTALLED)
-        }
-    }
-
-    private fun updateInstallationIssue(pkgName: String) {
-        GlobalScope.launch {
-            val fusedDownload = appManagerWrapper.getFusedDownload(packageName = pkgName)
-            appManagerWrapper.installationIssue(fusedDownload)
-        }
-    }
-}
diff --git a/auth-data-lib/build.gradle b/auth-data-lib/build.gradle
index 3d3319ef19df61e5b7ec985628e74fa000a7aa2e..0b8ba86b572fa355e920b248b98a94fbb0000e24 100644
--- a/auth-data-lib/build.gradle
+++ b/auth-data-lib/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 publishing {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd866a780d00c34dd77acde70060cb0b8ed67c94..74f91bbc498a5026032a86e4d0297bf2d8e1e0cd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ hiltCompiler = "1.2.0"
 hiltWork = "1.2.0"
 lifecycleExtensions = "1.1.1"
 fragmentKtx = "1.8.5"
-gplayapi = "3.4.2-0"
+gplayapi = "3.4.5-0"
 gson = "2.11.0"
 jacksonDataformatYaml = "2.17.0"
 jsoup = "1.17.2"
diff --git a/parental-control-data/build.gradle b/parental-control-data/build.gradle
index b65ce550605cd81dd41f15f60fe153f491d08b5a..2b15ab8e7914fd024e2d88bc2b57bb401722ffba 100644
--- a/parental-control-data/build.gradle
+++ b/parental-control-data/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 publishing {