diff --git a/.gitmodules b/.gitmodules
index 6a6b94f2b08376fabf4aa0847f656dafe62879e4..a5552e3aea9f54cd7fbdfeada82452c7d37ead7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,16 @@
 [submodule "ical4android"]
 	path = ical4android
-	url = https://github.com/bitfireAT/ical4android.git
+	url = https://gitlab.e.foundation/e/apps/ical4android.git
+	branch = sprint_freetown
 [submodule "vcard4android"]
 	path = vcard4android
-	url = https://github.com/bitfireAT/vcard4android.git
+	url = https://gitlab.e.foundation/e/apps/vcard4android.git
+	branch = sprint_freetown
 [submodule "cert4android"]
 	path = cert4android
-	url = https://github.com/bitfireAT/cert4android.git
+	url = https://gitlab.e.foundation/e/apps/cert4android.git
+	branch = sprint_freetown
+[submodule "dav4jvm"]
+	path = dav4jvm
+	url = https://gitlab.e.foundation/e/apps/dav4android.git
+	branch = sprint_freetown
diff --git a/app/build.gradle b/app/build.gradle
index e18f23fdb4213bbf932c0475872a1dfd2a7921d6..bc93ea75ed66d3b2f9bc4ac6473d02fc9731d87a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,13 +12,13 @@ android {
     buildToolsVersion '32.0.0'
 
     defaultConfig {
-        applicationId "at.bitfire.davdroid"
+        applicationId "foundation.e.accountmanager"
 
         versionCode 402010002
         versionName '4.2.1-rc.1-ose'
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
 
-        minSdkVersion 21        // Android 5
+        minSdkVersion 24        // Android 7.1
         targetSdkVersion 32     // Android 12
 
         buildConfigField "String", "userAgent", "\"DAVx5\""
@@ -30,6 +30,7 @@ android {
             arguments {
                 arg("room.schemaLocation", "$projectDir/schemas")
             }
+
         }
     }
 
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
index 374377d83ade36725c5c081b094e4c05b3558750..bde05a4baa52c0ef889367ebef9aaa64dcc4ac83 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt
@@ -33,11 +33,10 @@ import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.NotificationUtils
 import at.bitfire.davdroid.ui.account.SettingsActivity
-import at.bitfire.ical4android.CalendarStorageException
-import at.bitfire.ical4android.Ical4Android
-import at.bitfire.ical4android.TaskProvider
-import at.bitfire.ical4android.UsesThreadContextClassLoader
-import at.bitfire.vcard4android.ContactsStorageException
+
+import foundation.e.ical4android.CalendarStorageException
+import foundation.e.ical4android.TaskProvider
+import foundation.e.vcard4android.ContactsStorageException
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -815,7 +814,8 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L
                 is LocalEvent ->
                     Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id))
                 is LocalTask ->
-                    Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(TaskContract.Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), id))
+                    Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(TaskContract.Tasks.getContentUri(
+                        TaskProvider.ProviderName.OpenTasks.authority), id))
                 else ->
                     null
             }
diff --git a/vcard4android b/vcard4android
index ab6167b9213c2fe03ca159f6eb6bd1472ede1fab..294fca472507f311c293d79caee3600f16f23d21 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit ab6167b9213c2fe03ca159f6eb6bd1472ede1fab
+Subproject commit 294fca472507f311c293d79caee3600f16f23d21