diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b0b3f8d7f..01c44ddc7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,7 +53,7 @@ android {
         textReport = true
     }
 
-    compileSdkVersion(Versions.targetSdk)
+    compileSdk = Versions.compileSdk
 
     defaultConfig {
         testApplicationId = "org.tasks.test"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2cf2133bd..c80b30bfe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -337,9 +337,15 @@
     <!-- ======================================================= Providers = -->
 
     <provider
-      android:name="androidx.work.impl.WorkManagerInitializer"
-      android:authorities="${applicationId}.workmanager-init"
-      tools:node="remove" />
+        android:name="androidx.startup.InitializationProvider"
+        android:authorities="${applicationId}.androidx-startup"
+        android:exported="false"
+        tools:node="merge">
+      <meta-data
+          android:name="androidx.work.WorkManagerInitializer"
+          android:value="androidx.startup"
+          tools:node="remove" />
+    </provider>
 
     <provider
       android:authorities="${applicationId}.tasksprovider"
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index e00d136c6..8e679496f 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,8 +1,9 @@
 object Versions {
     const val kotlin = "1.5.21"
+    const val compileSdk = 31
     const val targetSdk = 30
     const val minSdk = 24
-    const val work = "2.5.0"
+    const val work = "2.7.0-beta01"
     const val leakcanary = "2.7"
     const val room = "2.3.0"
     const val crashlytics = "18.0.0"
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index f5c708921..c6a645b27 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -235,9 +235,14 @@
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.hilt:hilt-common:1.0.0
 +|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.37 (*)
-+|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
++|    +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
++|    |    +--- androidx.startup:startup-runtime:1.0.0
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
++|    |    |    \--- androidx.tracing:tracing:1.0.0 (*)
++|    |    +--- androidx.core:core:1.5.0-beta01 -> 1.5.0 (*)
 +|    |    +--- androidx.room:room-runtime:2.2.5 -> 2.3.0
 +|    |    |    +--- androidx.room:room-common:2.3.0
 +|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -364,11 +369,11 @@
 +|    +--- com.google.http-client:google-http-client:1.39.2 (*)
 +|    +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
 +|    \--- com.google.guava:guava:30.1.1-android (*)
-++--- androidx.work:work-runtime:2.5.0 (*)
-++--- androidx.work:work-runtime-ktx:2.5.0
-+|    +--- androidx.work:work-runtime:2.5.0 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.5.21 (*)
-+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*)
+++--- androidx.work:work-runtime:2.7.0-beta01 (*)
+++--- androidx.work:work-runtime-ktx:2.7.0-beta01
++|    +--- androidx.work:work-runtime:2.7.0-beta01 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 (*)
++|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*)
 ++--- com.etesync:journalmanager:1.1.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.21 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
@@ -451,9 +456,7 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*)
 +|    \--- androidx.profileinstaller:profileinstaller:1.0.2
 +|         +--- androidx.annotation:annotation:1.2.0
-+|         \--- androidx.startup:startup-runtime:1.0.0
-+|              +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|              \--- androidx.tracing:tracing:1.0.0 (*)
++|         \--- androidx.startup:startup-runtime:1.0.0 (*)
 ++--- androidx.compose.foundation:foundation:1.0.2
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.compose.animation:animation:1.0.2
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 11725e132..a1083d6ed 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -354,9 +354,14 @@
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.hilt:hilt-common:1.0.0
 +|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.37 (*)
-+|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
++|    +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
++|    |    +--- androidx.startup:startup-runtime:1.0.0
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
++|    |    |    \--- androidx.tracing:tracing:1.0.0 (*)
++|    |    +--- androidx.core:core:1.5.0-beta01 -> 1.5.0 (*)
 +|    |    +--- androidx.room:room-runtime:2.2.5 -> 2.3.0
 +|    |    |    +--- androidx.room:room-common:2.3.0
 +|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -483,11 +488,11 @@
 +|    +--- com.google.http-client:google-http-client:1.39.2 (*)
 +|    +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
 +|    \--- com.google.guava:guava:30.1.1-android (*)
-++--- androidx.work:work-runtime:2.5.0 (*)
-++--- androidx.work:work-runtime-ktx:2.5.0
-+|    +--- androidx.work:work-runtime:2.5.0 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.5.21 (*)
-+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*)
+++--- androidx.work:work-runtime:2.7.0-beta01 (*)
+++--- androidx.work:work-runtime-ktx:2.7.0-beta01
++|    +--- androidx.work:work-runtime:2.7.0-beta01 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 (*)
++|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*)
 ++--- com.etesync:journalmanager:1.1.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.21 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
@@ -570,9 +575,7 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*)
 +|    \--- androidx.profileinstaller:profileinstaller:1.0.2
 +|         +--- androidx.annotation:annotation:1.2.0
-+|         \--- androidx.startup:startup-runtime:1.0.0
-+|              +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|              \--- androidx.tracing:tracing:1.0.0 (*)
++|         \--- androidx.startup:startup-runtime:1.0.0 (*)
 ++--- androidx.compose.foundation:foundation:1.0.2
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.compose.animation:animation:1.0.2