diff --git a/app/build.gradle b/app/build.gradle
index e51dc9c380..73d8920310 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -255,7 +255,7 @@ dependencies {
     def room_version = "2.3.0-rc01"
     def paging_version = "2.1.2" // 3.0.0-alpha11
     def preference_version = "1.1.1"
-    def work_version = "2.5.0" // 2.6.0-alpha01
+    def work_version = "2.6.0-alpha01"
     def exif_version = "1.3.2"
     def biometric_version = "1.2.0-alpha03"
     def billingclient_version = "3.0.3"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 48a47f1103..572727ad61 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -384,8 +384,8 @@
         </provider>
 
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
 
         <receiver
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 48a47f1103..572727ad61 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -384,8 +384,8 @@
         </provider>
 
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
 
         <receiver
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a1aa3630b..d1c23e1daf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -384,8 +384,8 @@
         </provider>
 
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
 
         <receiver
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 45a8b8f231..2c4a17e61f 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -194,6 +194,7 @@ public class ApplicationEx extends Application
     @NonNull
     @Override
     public androidx.work.Configuration getWorkManagerConfiguration() {
+        // https://developer.android.com/jetpack/androidx/releases/work#2.6.0-alpha01
         // https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration
         return new androidx.work.Configuration.Builder()
                 .setMinimumLoggingLevel(android.util.Log.INFO)
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 09d1ce75e5..65f4f49c57 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -385,8 +385,8 @@
         </provider>
 
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
 
         <receiver