diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 40b688e90..ac291b965 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ repositories {
     maven {
         url = uri("https://jitpack.io")
         content {
-            includeGroup("com.gitlab.abaker")
-            includeModule("com.gitlab.bitfireAT", "cert4android")
+            includeGroup("com.github.tasks")
+            includeModule("com.github.bitfireAT", "cert4android")
             includeModule("com.github.tasks.opentasks", "opentasks-provider")
             includeModule("com.github.QuadFlask", "colorpicker")
             includeModule("com.github.twofortyfouram", "android-plugin-api-for-locale")
@@ -162,9 +162,11 @@ val googleplayImplementation by configurations
 
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-    implementation("com.gitlab.abaker:dav4jvm:deb2c9aef8")
-    implementation("com.gitlab.abaker:ical4android:0e928b567c")
-    implementation("com.gitlab.bitfireAT:cert4android:26a91a729f")
+    implementation("com.github.tasks:dav4jvm:deb2c9aef8")
+    implementation("com.github.tasks:ical4android:0e928b567c") {
+        exclude(group = "com.sun.mail", module = "javax.mail")
+    }
+    implementation("com.github.bitfireAT:cert4android:26a91a729f")
     implementation("com.github.tasks.opentasks:opentasks-provider:a1faa1b") {
         exclude("com.github.tasks.opentasks", "opentasks-contract")
     }
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index a195faaa7..3fc3596e0 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -113,10 +113,10 @@
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.3.0
 +|    +--- androidx.databinding:databinding-runtime:7.0.4 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.6.10 (*)
-++--- com.gitlab.abaker:dav4jvm:deb2c9aef8
+++--- com.github.tasks:dav4jvm:deb2c9aef8
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
 +|    \--- org.apache.commons:commons-lang3:3.8.1
-++--- com.gitlab.abaker:ical4android:0e928b567c
+++--- com.github.tasks:ical4android:0e928b567c
 +|    +--- org.mnode.ical4j:ical4j:3.0.21
 +|    |    +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30
 +|    |    +--- commons-codec:commons-codec:1.11
@@ -129,7 +129,7 @@
 +|    +--- org.slf4j:slf4j-jdk14:1.7.30
 +|    |    \--- org.slf4j:slf4j-api:1.7.30
 +|    \--- androidx.core:core-ktx:1.3.2 (*)
-++--- com.gitlab.bitfireAT:cert4android:26a91a729f
+++--- com.github.bitfireAT:cert4android:26a91a729f
 +|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.4
 +|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.4 (*)
 +|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.4 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 5b06fdcaf..a79cd47bd 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -252,10 +252,10 @@
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6 -> 1.5.2 (*)
 +|    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
 +|    \--- androidx.fragment:fragment:1.1.0 -> 1.4.0 (*)
-++--- com.gitlab.abaker:dav4jvm:deb2c9aef8
+++--- com.github.tasks:dav4jvm:deb2c9aef8
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
 +|    \--- org.apache.commons:commons-lang3:3.8.1
-++--- com.gitlab.abaker:ical4android:0e928b567c
+++--- com.github.tasks:ical4android:0e928b567c
 +|    +--- org.mnode.ical4j:ical4j:3.0.21
 +|    |    +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30
 +|    |    +--- commons-codec:commons-codec:1.11
@@ -268,7 +268,7 @@
 +|    +--- org.slf4j:slf4j-jdk14:1.7.30
 +|    |    \--- org.slf4j:slf4j-api:1.7.30
 +|    \--- androidx.core:core-ktx:1.3.2 (*)
-++--- com.gitlab.bitfireAT:cert4android:26a91a729f
+++--- com.github.bitfireAT:cert4android:26a91a729f
 +|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.4
 +|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.4 (*)
 +|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.4 (*)