diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6481c83b4..c75ba0d0f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -90,8 +90,10 @@ android {
             }
             val tasks_mapbox_key_debug: String? by project
             val tasks_google_key_debug: String? by project
+            val tasks_caldav_url: String? by project
             resValue("string", "mapbox_key", tasks_mapbox_key_debug ?: "")
             resValue("string", "google_key", tasks_google_key_debug ?: "")
+            resValue("string", "tasks_caldav_url", tasks_caldav_url ?: "https://caldav.tasks.org")
             isTestCoverageEnabled = project.hasProperty("coverage")
         }
         getByName("release") {
diff --git a/app/src/debug/res/values/keys.xml b/app/src/debug/res/values/keys.xml
index a2ec86f79..819b809ea 100644
--- a/app/src/debug/res/values/keys.xml
+++ b/app/src/debug/res/values/keys.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name" tools:ignore="PrivateResource">Tasks Debug</string>
-  <string name="tasks_caldav_url">https://caldav.tasks.org</string>
   <string name="debug_strict_mode_thread">Strict mode - Thread</string>
   <string name="debug_strict_mode_vm">Strict mode - VM</string>
   <string name="debug_leakcanary">LeakCanary</string>
diff --git a/app/src/main/java/org/tasks/auth/Configuration.kt b/app/src/main/java/org/tasks/auth/Configuration.kt
index 5793e4856..45716c876 100644
--- a/app/src/main/java/org/tasks/auth/Configuration.kt
+++ b/app/src/main/java/org/tasks/auth/Configuration.kt
@@ -131,6 +131,12 @@ class Configuration constructor(
             }
         } else {
             discoveryUri = getRequiredConfigWebUri("discovery_uri")
+            if (BuildConfig.DEBUG) {
+                discoveryUri = Uri.parse(discoveryUri.toString().replace(
+                        """^https://caldav.tasks.org""".toRegex(),
+                        context.getString(R.string.tasks_caldav_url)
+                ))
+            }
         }
         isHttpsRequired = configJson!!.optBoolean("https_required", true)
     }