diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 2ee11de40..f3dcab65e 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -39,19 +39,19 @@ final class BuildSettings: NSObject {
     }
     
     static var pushKitAppIdProd: String {
-        Bundle.app.object(forInfoDictionaryKey: "pushKitAppIdProd") as! String
+        return baseBundleIdentifier + ".ios.voip.prod"
     }
     
     static var pushKitAppIdDev: String {
-        Bundle.app.object(forInfoDictionaryKey: "pushKitAppIdDev") as! String
+        return baseBundleIdentifier + ".ios.voip.dev"
     }
     
     static var pusherAppIdProd: String {
-        Bundle.app.object(forInfoDictionaryKey: "pusherAppIdProd") as! String
+        return baseBundleIdentifier + ".ios.prod"
     }
     
     static var pusherAppIdDev: String {
-        Bundle.app.object(forInfoDictionaryKey: "pusherAppIdDev") as! String
+        return baseBundleIdentifier + ".ios.dev"
     }
     
     // Element-Web instance for the app
diff --git a/Riot/Generated/InfoPlist.swift b/Riot/Generated/InfoPlist.swift
index 1398ab4c1..95bdbe12c 100644
--- a/Riot/Generated/InfoPlist.swift
+++ b/Riot/Generated/InfoPlist.swift
@@ -46,10 +46,6 @@ internal enum InfoPlist {
   internal static let applicationGroupIdentifier: String = _document["applicationGroupIdentifier"]
   internal static let baseBundleIdentifier: String = _document["baseBundleIdentifier"]
   internal static let keychainAccessGroup: String = _document["keychainAccessGroup"]
-  internal static let pushKitAppIdDev: String = _document["pushKitAppIdDev"]
-  internal static let pushKitAppIdProd: String = _document["pushKitAppIdProd"]
-  internal static let pusherAppIdDev: String = _document["pusherAppIdDev"]
-  internal static let pusherAppIdProd: String = _document["pusherAppIdProd"]
 }
 // swiftlint:enable identifier_name line_length type_body_length
 
diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
index 93d5ebcd4..28fe70e96 100644
--- a/Riot/SupportingFiles/Info.plist
+++ b/Riot/SupportingFiles/Info.plist
@@ -95,13 +95,5 @@
 	<string>$(BASE_BUNDLE_IDENTIFIER)</string>
 	<key>keychainAccessGroup</key>
 	<string>$(KEYCHAIN_ACCESS_GROUP)</string>
-	<key>pushKitAppIdProd</key>
-	<string>$(BASE_BUNDLE_IDENTIFIER).ios.voip.prod</string>
-	<key>pushKitAppIdDev</key>
-	<string>$(BASE_BUNDLE_IDENTIFIER).ios.voip.dev</string>
-	<key>pusherAppIdProd</key>
-	<string>$(BASE_BUNDLE_IDENTIFIER).ios.prod</string>
-	<key>pusherAppIdDev</key>
-	<string>$(BASE_BUNDLE_IDENTIFIER).ios.dev</string>
 </dict>
 </plist>