diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
index f7bf1ac8a..924c8a49c 100644
--- a/Config/AppConfiguration.swift
+++ b/Config/AppConfiguration.swift
@@ -28,6 +28,9 @@ class AppConfiguration: CommonConfiguration {
     }
     
     private func setupAppSettings() {
+        // Enable CallKit for app
+        MXKAppSettings.standard()?.isCallKitEnabled = true
+        
         // Enable long press on event in bubble cells
         MXKRoomBubbleTableViewCell.disableLongPressGesture(onEvent: false)
         
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 667c73527..3e26922f3 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -54,6 +54,22 @@ final class BuildSettings: NSObject {
         return baseBundleIdentifier + ".ios.dev"
     }
     
+    static var pushKitAppId: String {
+        #if DEBUG
+        return pushKitAppIdDev
+        #else
+        return pushKitAppIdProd
+        #endif
+    }
+    
+    static var pusherAppId: String {
+        #if DEBUG
+        return pusherAppIdDev
+        #else
+        return pusherAppIdProd
+        #endif
+    }
+    
     // Element-Web instance for the app
     static let applicationWebAppUrlString = "https://app.element.io"
     
diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
index 9086017ff..93d7f07cc 100644
--- a/Config/CommonConfiguration.swift
+++ b/Config/CommonConfiguration.swift
@@ -35,8 +35,8 @@ class CommonConfiguration: NSObject, Configurable {
         // Customize the localized string table
         Bundle.mxk_customizeLocalizedStringTableName("Vector")
         
-        // Enable CallKit
-        settings.isCallKitEnabled = true
+        // Disable CallKit
+        settings.isCallKitEnabled = false
         
         // Enable lazy loading
         settings.syncWithLazyLoadOfRoomMembers = true