diff --git a/app/build.gradle b/app/build.gradle
index 798f2c188..28438abd1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ plugins {
     id "kotlin-parcelize"
     id "kotlinx-serialization"
     id "com.google.devtools.ksp"
-    //id "com.huawei.agconnect"
+    id "com.huawei.agconnect"
 }
 
 
@@ -193,7 +193,9 @@ dependencies {
     amazonImplementation "com.google.android.gms:play-services-location:21.2.0"
 
     // Huawei billing
-    //huaweiImplementation "com.huawei.hms:iap:$version_huawei_iap"
+    huaweiImplementation "com.huawei.hms:iap:$version_huawei_iap"
+    huaweiImplementation "com.huawei.hms:appservice:6.10.0.300"
+
 
     // Google Maps
     gplayImplementation "com.google.maps.android:maps-compose:5.0.1"
@@ -261,7 +263,7 @@ dependencies {
     implementation "androidx.glance:glance-appwidget:1.1.0-rc01"
 
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
-    
+
     implementation "androidx.profileinstaller:profileinstaller:1.3.1"
 
     //image loading from the web
diff --git a/app/src/amazon/java/at/techbee/jtx/flavored/UpdateCheckManager.kt b/app/src/amazon/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
new file mode 100644
index 000000000..87095831d
--- /dev/null
+++ b/app/src/amazon/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+import android.app.Activity
+
+
+
+class UpdateCheckManager(val activity: Activity) : UpdateCheckManagerDefinition {
+
+    override fun checkForUpdates() {
+        // currently only used in HUAWEI
+    }
+}
\ No newline at end of file
diff --git a/app/src/generic/java/at/techbee/jtx/flavored/UpdateCheckManager.kt b/app/src/generic/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
new file mode 100644
index 000000000..7f034f907
--- /dev/null
+++ b/app/src/generic/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+import android.app.Activity
+
+
+class UpdateCheckManager(val activity: Activity) : UpdateCheckManagerDefinition {
+
+    override fun checkForUpdates() {
+        // currently only used in HUAWEI
+    }
+}
\ No newline at end of file
diff --git a/app/src/gplay/java/at/techbee/jtx/flavored/UpdateCheckManager.kt b/app/src/gplay/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
new file mode 100644
index 000000000..7f034f907
--- /dev/null
+++ b/app/src/gplay/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+import android.app.Activity
+
+
+class UpdateCheckManager(val activity: Activity) : UpdateCheckManagerDefinition {
+
+    override fun checkForUpdates() {
+        // currently only used in HUAWEI
+    }
+}
\ No newline at end of file
diff --git a/app/src/huawei/java/at/techbee/jtx/flavored/UpdateCheckManager.kt b/app/src/huawei/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
new file mode 100644
index 000000000..bc1d98396
--- /dev/null
+++ b/app/src/huawei/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import com.huawei.hms.jos.JosApps
+import com.huawei.updatesdk.service.appmgr.bean.ApkUpgradeInfo
+import com.huawei.updatesdk.service.otaupdate.CheckUpdateCallBack
+import com.huawei.updatesdk.service.otaupdate.UpdateKey
+
+
+class UpdateCheckManager(val activity: Activity) : UpdateCheckManagerDefinition {
+
+    override fun checkForUpdates() {
+        val client = JosApps.getAppUpdateClient(activity)
+        client.checkAppUpdate(activity, object: CheckUpdateCallBack {
+            override fun onUpdateInfo(intent: Intent?) {
+                if (intent != null) {
+                    val info = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        intent.getSerializableExtra(UpdateKey.INFO, ApkUpgradeInfo::class.java)
+                    } else {
+                        intent.getSerializableExtra(UpdateKey.INFO) as ApkUpgradeInfo?
+                    }
+                    if(intent.getBooleanExtra(UpdateKey.MUST_UPDATE, false))
+                        JosApps.getAppUpdateClient(activity).showUpdateDialog(activity, info, false)
+                }
+            }
+            override fun onMarketInstallInfo(p0: Intent?) { }
+            override fun onMarketStoreError(p0: Int) { }
+            override fun onUpdateStoreError(p0: Int) { }
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20a108181..1221418e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,8 +82,10 @@
         </intent>
     </queries>
 
+    <!-- 'tools:replace="android:allowBackup"' necessary for Huawei flavor -->
     <application
         android:allowBackup="true"
+        tools:replace="android:allowBackup"
         android:fullBackupOnly="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/at/techbee/jtx/MainActivity2.kt b/app/src/main/java/at/techbee/jtx/MainActivity2.kt
index 9252877b0..bf3978da9 100644
--- a/app/src/main/java/at/techbee/jtx/MainActivity2.kt
+++ b/app/src/main/java/at/techbee/jtx/MainActivity2.kt
@@ -47,6 +47,7 @@ import at.techbee.jtx.database.locals.StoredListSettingData
 import at.techbee.jtx.database.properties.Attachment
 import at.techbee.jtx.flavored.BillingManager
 import at.techbee.jtx.flavored.JtxReviewManager
+import at.techbee.jtx.flavored.UpdateCheckManager
 import at.techbee.jtx.ui.GlobalStateHolder
 import at.techbee.jtx.ui.about.AboutScreen
 import at.techbee.jtx.ui.about.AboutViewModel
@@ -140,6 +141,7 @@ class MainActivity2 : AppCompatActivity() {
         TimeZoneRegistryFactory.getInstance().createRegistry() // necessary for ical4j
         createNotificationChannels()   // Register Notification Channel for Reminders
         BillingManager.getInstance().initialise(this)
+        UpdateCheckManager(this).checkForUpdates()
 
         /* START Initialise biometric prompt */
         globalStateHolder.biometricPrompt = BiometricPrompt(this, ContextCompat.getMainExecutor(this),
diff --git a/app/src/main/java/at/techbee/jtx/flavored/UpdateCheckManagerDefinition.kt b/app/src/main/java/at/techbee/jtx/flavored/UpdateCheckManagerDefinition.kt
new file mode 100644
index 000000000..422397daf
--- /dev/null
+++ b/app/src/main/java/at/techbee/jtx/flavored/UpdateCheckManagerDefinition.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+interface UpdateCheckManagerDefinition {
+
+    fun checkForUpdates()
+}
\ No newline at end of file
diff --git a/app/src/ose/java/at/techbee/jtx/flavored/UpdateCheckManager.kt b/app/src/ose/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
new file mode 100644
index 000000000..87095831d
--- /dev/null
+++ b/app/src/ose/java/at/techbee/jtx/flavored/UpdateCheckManager.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Techbee e.U.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+package at.techbee.jtx.flavored
+
+import android.app.Activity
+
+
+
+class UpdateCheckManager(val activity: Activity) : UpdateCheckManagerDefinition {
+
+    override fun checkForUpdates() {
+        // currently only used in HUAWEI
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ce443c1fe..b796efc4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,8 +30,8 @@ buildscript {
         version_review = "2.0.1"
         version_compose = "1.6.7"
         version_about_libraries = "11.2.0"
-        version_huawei = "1.8.1.300"
-        version_huawei_iap = "6.10.0.300"
+        version_huawei = "1.9.1.302"
+        version_huawei_iap = "6.13.0.300"
         version_accompanist = "0.34.0"
         version_osmdroid = "6.1.18"
     }
@@ -44,7 +44,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
 
         // Huawei - only for use in Huawei branch
-        //maven { url 'https://developer.huawei.com/repo/' }
+        maven { url 'https://developer.huawei.com/repo/' }
     }
 
     dependencies {
@@ -53,7 +53,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_kotlin"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$version_kotlin"
         // Huawei - only for use in Huawei branch
-        //classpath "com.huawei.agconnect:agcp:$version_huawei"
+        classpath "com.huawei.agconnect:agcp:$version_huawei"
     }
 }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/207090015.txt b/fastlane/metadata/android/en-US/changelogs/207090015.txt
new file mode 100644
index 000000000..2aa946530
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/207090015.txt
@@ -0,0 +1,4 @@
+* Fixed task duplication when changing collections
+* Fixed potential crashes when adding a subtask
+* Fixed broken alarms
+* Upgraded widget (including layout changes to comply with default widgets)
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 44492eb92..542a1841e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 
 # configuration cache [https://docs.gradle.org/current/userguide/configuration_cache.html]
-org.gradle.configuration-cache=true
+#org.gradle.configuration-cache=true
 #org.gradle.configuration-cache.problems=warn
 
 # https://docs.gradle.org/current/userguide/build_cache.html
@@ -15,3 +15,6 @@ android.useAndroidX=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 android.enableR8.fullMode=false
+
+#Special for Huawei because AGP 8.0 is not supported
+apmsInstrumentationEnabled=false
\ No newline at end of file