diff --git a/ObjectiveDropboxOfficial.podspec b/ObjectiveDropboxOfficial.podspec
index 541869147..2dc39aba9 100644
--- a/ObjectiveDropboxOfficial.podspec
+++ b/ObjectiveDropboxOfficial.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'ObjectiveDropboxOfficial'
-  s.version      = '3.0.1'
+  s.version      = '3.0.2'
   s.summary      = 'Dropbox Objective C SDK for APIv2'
   s.homepage     = 'https://dropbox.com/developers/'
   s.license      = 'MIT'
diff --git a/README.md b/README.md
index dadc3a8bf..7837969d0 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ brew install carthage
 
 ```
 # ObjectiveDropboxOfficial
-github "https://github.com/dropbox/dropbox-sdk-obj-c" ~> 3.0.1
+github "https://github.com/dropbox/dropbox-sdk-obj-c" ~> 3.0.2
 ```
 
 Then, run the following command to checkout and build the Dropbox Objective-C SDK repository:
diff --git a/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_iOS/Info.plist b/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_iOS/Info.plist
index e8ee544ac..dfe1b996c 100644
--- a/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_iOS/Info.plist
+++ b/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_iOS/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_macOS/Info.plist b/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_macOS/Info.plist
index 98043e256..ab30bb109 100644
--- a/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_macOS/Info.plist
+++ b/Source/ObjectiveDropboxOfficial/Platform/ObjectiveDropboxOfficial_macOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseClient.m b/Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseClient.m
index 6c3ec41b7..372b3f136 100644
--- a/Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseClient.m
+++ b/Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseClient.m
@@ -14,7 +14,7 @@
 
 #pragma mark - Internal serialization helpers
 
-static NSString *kV2SDKVersion = @"3.0.1";
+static NSString *kV2SDKVersion = @"3.0.2";
 static NSString *kV2SDKDefaultUserAgentPrefix = @"OfficialDropboxObjCSDKv2";
 NSDictionary<NSString *, NSString *> *kV2SDKBaseHosts;
 
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
index 5c3597e39..e2be80965 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_iOS/AppDelegate.m
@@ -29,7 +29,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   }
 
   NSUserDefaults *Defaults = [NSUserDefaults standardUserDefaults];
-  [Defaults setObject:@"YES" forKey:@"KeychainV1TokenMigration"];
+  NSString *migrationOccuredLookupKey = [NSString stringWithFormat: @"KeychainV1TokenMigration-%@", data.fullDropboxAppKey];
+  [Defaults setObject:@"YES" forKey:migrationOccuredLookupKey];
   [DBClientsManager checkAndPerformV1TokenMigration:^(BOOL shouldRetry, BOOL invalidAppKeyOrSecret, NSArray<NSArray<NSString *> *> *unsuccessfullyMigratedTokenData) {
     NSLog(@"Migration completed.");
     NSLog(shouldRetry ? @"ShouldRetry: Yes" : @"ShouldRetry: No");
diff --git a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
index 4af1ebf13..6bff641a4 100644
--- a/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
+++ b/TestObjectiveDropbox/TestObjectiveDropbox_macOS/AppDelegate.m
@@ -31,7 +31,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   }
 
   NSUserDefaults *Defaults = [NSUserDefaults standardUserDefaults];
-  [Defaults setObject:@"YES" forKey:@"KeychainV1TokenMigration"];
+  NSString *migrationOccuredLookupKey = [NSString stringWithFormat: @"KeychainV1TokenMigration-%@", data.fullDropboxAppKey];
+  [Defaults setObject:@"YES" forKey:migrationOccuredLookupKey];
   [DBClientsManager checkAndPerformV1TokenMigration:^(BOOL shouldRetry, BOOL invalidAppKeyOrSecret, NSArray<NSArray<NSString *> *> *unsuccessfullyMigratedTokenData) {
     NSLog(@"Migration completed.");
     NSLog(shouldRetry ? @"ShouldRetry: Yes" : @"ShouldRetry: No");
diff --git a/update_repo_check.sh b/update_repo_check.sh
index dd213c180..524927a47 100755
--- a/update_repo_check.sh
+++ b/update_repo_check.sh
@@ -5,7 +5,7 @@
 # 0. Check on DBApp, Chime, Paper. Run analyzer.
 # 1. Make sure test data is reset
 # 2. Run generator
-# 3. Check pod spec lint
+# 3. Run update version script. Check pod spec lint
 # 4. Check test project, run unit tests
 # 5. Increment version
 # 6. Update Carthage example project