diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
index b4fd6dcd18..ca6e5a18e1 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
@@ -22,13 +22,15 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.ApplicationContext
 import javax.inject.Inject
 
-class PostHogFactory @Inject constructor(
+internal class PostHogFactory @Inject constructor(
     @ApplicationContext private val context: Context,
     private val buildMeta: BuildMeta,
+    private val posthogEndpointConfigProvider: PosthogEndpointConfigProvider,
 ) {
 
     fun createPosthog(): PostHog {
-        return PostHog.Builder(context, PosthogConfig.postHogApiKey, PosthogConfig.postHogHost)
+        val endpoint = posthogEndpointConfigProvider.provide()
+        return PostHog.Builder(context, endpoint.apiKey, endpoint.host)
                 // Record certain application events automatically! (off/false by default)
                 // .captureApplicationLifecycleEvents()
                 // Record screen views automatically! (off/false by default)
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
index 1f21c0beb5..ca5ac527d9 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
@@ -32,10 +32,10 @@ import javax.inject.Inject
 // private val IGNORED_OPTIONS: Options? = null
 
 @ContributesMultibinding(AppScope::class)
-class PosthogAnalyticsProvider @Inject constructor(
+internal class PosthogAnalyticsProvider @Inject constructor(
     private val postHogFactory: PostHogFactory,
 ) : AnalyticsProvider {
-    override val name = PosthogConfig.name
+    override val name = "Posthog"
 
     private var posthog: PostHog? = null
     private var analyticsId: String? = null
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogConfig.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
similarity index 77%
rename from services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogConfig.kt
rename to services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
index 96d8659b11..06f10fc07b 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogConfig.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
@@ -16,8 +16,7 @@
 
 package io.element.android.services.analyticsproviders.posthog
 
-object PosthogConfig {
-    const val name = "Posthog"
-    const val postHogHost = "https://posthog.element.dev"
-    const val postHogApiKey = "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN"
-}
+internal data class PosthogEndpointConfig(
+    val host: String,
+    val apiKey: String,
+)
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt
new file mode 100644
index 0000000000..841f41b807
--- /dev/null
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.services.analyticsproviders.posthog
+
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.meta.BuildType
+import javax.inject.Inject
+
+internal class PosthogEndpointConfigProvider @Inject constructor(
+    private val buildMeta: BuildMeta,
+) {
+    fun provide(): PosthogEndpointConfig {
+        return when (buildMeta.buildType) {
+            BuildType.RELEASE -> PosthogEndpointConfig(
+                host = "https://posthog.element.io",
+                apiKey = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+            )
+            BuildType.NIGHTLY,
+            BuildType.DEBUG -> PosthogEndpointConfig(
+                host = "https://posthog.element.dev",
+                apiKey = "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN",
+            )
+        }
+    }
+}