diff --git a/app/init/credentials.ts b/app/init/credentials.ts
index c87984b7f0..3477c5a700 100644
--- a/app/init/credentials.ts
+++ b/app/init/credentials.ts
@@ -84,12 +84,10 @@ export const removeServerCredentials = async (serverUrl: string) => {
     if (Platform.OS === 'ios') {
         const appGroup = getIOSAppGroupDetails();
         options.accessGroup = appGroup.appGroupIdentifier;
-
-        await KeyChain.resetInternetCredentials(serverUrl, options);
-    } else {
-        await KeyChain.resetGenericPassword(options);
     }
 
+    await KeyChain.resetInternetCredentials(serverUrl, options);
+
     await AsyncStorage.removeItem(ASYNC_STORAGE_CURRENT_SERVER_KEY);
 };
 
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 31578a4a4d..fb618fd985 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -15,9 +15,9 @@
 		279A77DD26A6F1BE00B515F1 /* compass-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 279A77DC26A6F1BE00B515F1 /* compass-icons.ttf */; };
 		2D5296A8926B4D7FBAF2D6E2 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */; };
 		4953BF602368AE8600593328 /* SwimeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4953BF5F2368AE8600593328 /* SwimeProxy.swift */; };
-		49AE36FF26D4455800EF4E52 /* Gekidou in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE36FE26D4455800EF4E52 /* Gekidou */; };
-		49AE370126D4455D00EF4E52 /* Gekidou in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE370026D4455D00EF4E52 /* Gekidou */; };
-		49AE370526D5CD7800EF4E52 /* Gekidou in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE370426D5CD7800EF4E52 /* Gekidou */; };
+		49AE36FF26D4455800EF4E52 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE36FE26D4455800EF4E52 /* SwiftPackageProductDependency */; };
+		49AE370126D4455D00EF4E52 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE370026D4455D00EF4E52 /* SwiftPackageProductDependency */; };
+		49AE370526D5CD7800EF4E52 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 49AE370426D5CD7800EF4E52 /* SwiftPackageProductDependency */; };
 		49B4C050230C981C006E919E /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; };
 		531BEBC72513E93C00BC05B1 /* compass-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */; };
 		536CC6C323E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 536CC6C123E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.m */; };
@@ -222,7 +222,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49AE370526D5CD7800EF4E52 /* Gekidou in Frameworks */,
+				49AE370526D5CD7800EF4E52 /* BuildFile in Frameworks */,
 				49B4C050230C981C006E919E /* libUploadAttachments.a in Frameworks */,
 				6C9B1EFD6561083917AF06CF /* libPods-Mattermost.a in Frameworks */,
 			);
@@ -232,7 +232,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49AE36FF26D4455800EF4E52 /* Gekidou in Frameworks */,
+				49AE36FF26D4455800EF4E52 /* BuildFile in Frameworks */,
 				7FABE0562213884700D0F595 /* libUploadAttachments.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -241,7 +241,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49AE370126D4455D00EF4E52 /* Gekidou in Frameworks */,
+				49AE370126D4455D00EF4E52 /* BuildFile in Frameworks */,
 				7F581F78221EEA7C0099E66B /* libUploadAttachments.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -480,7 +480,7 @@
 			);
 			name = Mattermost;
 			packageProductDependencies = (
-				49AE370426D5CD7800EF4E52 /* Gekidou */,
+				49AE370426D5CD7800EF4E52 /* SwiftPackageProductDependency */,
 			);
 			productName = "Hello World";
 			productReference = 13B07F961A680F5B00A75B9A /* Mattermost.app */;
@@ -501,7 +501,7 @@
 			);
 			name = MattermostShare;
 			packageProductDependencies = (
-				49AE36FE26D4455800EF4E52 /* Gekidou */,
+				49AE36FE26D4455800EF4E52 /* SwiftPackageProductDependency */,
 			);
 			productName = MattermostShare;
 			productReference = 7F240A19220D3A2300637665 /* MattermostShare.appex */;
@@ -522,7 +522,7 @@
 			);
 			name = NotificationService;
 			packageProductDependencies = (
-				49AE370026D4455D00EF4E52 /* Gekidou */,
+				49AE370026D4455D00EF4E52 /* SwiftPackageProductDependency */,
 			);
 			productName = NotificationService;
 			productReference = 7F581D32221ED5C60099E66B /* NotificationService.appex */;
@@ -1254,15 +1254,15 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		49AE36FE26D4455800EF4E52 /* Gekidou */ = {
+		49AE36FE26D4455800EF4E52 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Gekidou;
 		};
-		49AE370026D4455D00EF4E52 /* Gekidou */ = {
+		49AE370026D4455D00EF4E52 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Gekidou;
 		};
-		49AE370426D5CD7800EF4E52 /* Gekidou */ = {
+		49AE370426D5CD7800EF4E52 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = Gekidou;
 		};
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e570c5b4e9..792d31ede2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -721,7 +721,7 @@ SPEC CHECKSUMS:
   EXFileSystem: 0a04aba8da751b9ac954065911bcf166503f8267
   ExpoModulesCore: 2734852616127a6c1fc23012197890a6f3763dc7
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: 8d2166c0d020bf0a6a619c3d36b9a167a4c339b9
+  FBReactNativeSpec: cef0cc6d50abc92e8cf52f140aa22b5371cfec0b
   glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
   jail-monkey: 07b83767601a373db876e939b8dbf3f5eb15f073
   libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0