@@ -26,7 +26,7 @@ If none of the links solve your problem, see [Where can I get help](WhereCanIGet
   * [AAPS Builder](#aaps-builder-troubleshooting)
   * [Browser build](#aaps-ci-troubleshooting)
   * [Android Studio](TroubleshootingAndroidStudio.md)
-* [Lost keystore](#troubleshooting_androidstudio-lost-keystore)
+* Lost keystore, or new keystore: [Reinstalling AAPS](#reinstall-aaps)
 * Updating **AAPS**: [with a browser build](#update-browser-build-troubleshooting), [with Android Studio](#update-computer-build-troubleshooting)
 
 ### Installing
 
@@ -0,0 +1,45 @@
+(reinstall-aaps)=
+# Reinstalling AAPS with a new keystore
+
+Every **AAPS** apk is signed with a **keystore**. An update only installs over your current **AAPS** if it is signed with the **same keystore**: all your settings and data are then kept. That's why it is recommended to store the keystore and its password in a safe place.
+
+If you try to install an apk signed with a different keystore than before, you will get an error message explaining that the installation failed!
+
+(reinstall-aaps-when)=
+## When do you need to reinstall?
+
+You need to uninstall and reinstall **AAPS** when your new apk is signed with a different keystore, for example:
+
+- You cannot find your old keystore or its password.
+- You created a new keystore, for example with [Option 1 of the browser build](../SettingUpAaps/BrowserBuildKeystore.md) or **Create a new key** in [AAPS Builder](../SettingUpAaps/BrowserBuildAapsBuilder.md).
+- You build on a new computer and did not copy your keystore to it.
+
+If you still have your keystore, you don't need this page: reuse it and [update **AAPS**](../Maintenance/UpdateToNewVersion.md) in place.
+
+(reinstall-aaps-before)=
+## Before you start
+
+- Uninstalling **AAPS** deletes all its settings, your objectives and the current pump connection. You get them back by importing your **settings file**, so make sure you have a recent one.
+- The settings file does not contain your treatment and glucose history. If you upload to Nightscout, your past data is still available there.
+- **Omnipod and Medtrum users:** read [Tubeless pumps](#ExportImportSettings-tubeless-pumps) first. Your settings file must have been exported during the pod or patch you are wearing now.
+- If needed, [set up your CGM/BG source receiver](../Getting-Started/CompatiblesCgms.md) before you start.
+
+(reinstall-aaps-steps)=
+## Steps
+
+1. [Export settings](#ExportImportSettings-Automating-Settings-Export) on your phone.
+2. Copy or upload the settings file from your phone to an external location (i.e. your computer, cloud storage service...).
+3. [Build](../SettingUpAaps/BuildingAaps.md) a new signed apk with your new keystore and transfer it to your phone.
+4. Uninstall previous **AAPS** version on your phone.
+5. Install new **AAPS** version on your phone.
+6. [Import settings](#ExportImportSettings-restoring-from-your-backups-on-a-new-phone-or-fresh-installation-of-aaps) to restore your objectives and configuration.
+
+   If you can't find these on your phone, copy them from the external storage to your phone.
+
+7. Check your battery optimization options and disable them again.
+8. Keep on looping.
+
+(reinstall-aaps-afterwards)=
+## Afterwards
+
+Always keep using your new keystore from now on, and store it with its password somewhere safe, off your phone. See [Creating back-ups](../Maintenance/ExportImportSettings.md).
@@ -9,23 +9,7 @@
 
 (troubleshooting_androidstudio-lost-keystore)=
 ## Lost keystore
-If you use the same keystore when updating **AAPS** you do not have to uninstall the previous version on your smartphone. That's why it is recommended to store the keystore in a safe place.
-
-If you try to install the apk, signed with a different keystore than before, you will get an error message explaining that the installation failed!
-
-In the event that you cannot trace your old keystore or password, proceed as follows:
-
-1. [Export settings](../Maintenance/ExportImportSettings.md) on your phone.
-2. Copy or upload the settings file from your phone to an external location (i.e. your computer, cloud storage service...).
-4. Generate a new version of the signed apk as described on the [Update guide](../Maintenance/UpdateToNewVersion) and transfer it to your phone.
-5. Uninstall previous **AAPS** version on your phone.
-6. Install new **AAPS** version on your phone.
-7. [Import settings](#ExportImportSettings-restoring-from-your-backups-on-a-new-phone-or-fresh-installation-of-aaps) to restore your objectives and configuration.
-
-   If you can't find these on your phone, copy them from the external storage to your phone.
-   
-8. Check your battery optimization options and disable them again.
-9. Keep on looping.
+If you lost your keystore or its password, an apk signed with a new keystore cannot update your current **AAPS**: you have to uninstall and reinstall it. See [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 
 ## Gradle Sync failed
 Gradle Sync can fail for various reasons. When you receive a message saying that 'gradle sync failed', open the "Build" tab (1) at the bottom of Android Studio and check what error message (2) is displayed.
@@ -261,6 +245,7 @@ Your apk was built successfully and can be transferred to your phone!
 ![phone app note installed](../images/Update_AppNotInstalled.png)
 
 * Make sure you have transferred the “app-full-release.apk” file to your phone.
+* This error usually means the new apk is signed with a different keystore than your installed **AAPS**. If you still have your previous keystore, select it and build again. Otherwise, see [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 * If "App not installed" is displayed on your phone follow these steps:
 
 1. [Export settings](../Maintenance/ExportImportSettings.md) (in AAPS version already installed on your phone)
 
@@ -22,7 +22,7 @@ Below are the items that are recommended for keeping back-ups.
 ## Creating back-ups
 
 ### Keystore file from the computer you used to build the APK
-When building your .APK installer file from Android Studio, it uses the **keystore file and password to sign the .APK installer file**. To update your current AAPS installation, it is required to sign the update .APK installer file with the same keystore used for the initial installation. When updating, all settings and the AAPS database will be kept. Note that without this, you are required to first uninstall the current application and then reinstall and reconfigure AAPS.
+When building your .APK installer file from Android Studio, it uses the **keystore file and password to sign the .APK installer file**. To update your current AAPS installation, it is required to sign the update .APK installer file with the same keystore used for the initial installation. When updating, all settings and the AAPS database will be kept. Note that without this, you are required to first uninstall the current application and then [reinstall](#reinstall-aaps) and reconfigure AAPS.
 
 Maintaining the keystore and associated password will greatly reduce the complexity of updating the APK in the future, especially if you need to build the app from a new computer. See the [Updating AAPS](../Maintenance/UpdateToNewVersion.md) section for details on using the keystore when building a new APK. 
 
@@ -125,7 +125,7 @@ Use these instructions if you have a back-up of your APK and **Preferences** tha
 
 _If you are updating **AAPS** using an APK built with the same keystore you should not need to follow this process. However, it is still advised to create a back-up before you apply the update._
 
-If you are updating **AAPS** after you lost or replaced your original keystore (i.e. using a new build computer without transferring the keystore), ensure that you back up all settings per the above and then uninstall the existing version of **AAPS** on your phone. 
+If you are updating **AAPS** after you lost or replaced your original keystore (i.e. using a new build computer without transferring the keystore), ensure that you back up all settings per the above and then uninstall the existing version of **AAPS** on your phone. See [Reinstalling AAPS with a new keystore](#reinstall-aaps) for the full procedure.
 
 If needed, [set up your CGM/BG source receiver](../Getting-Started/CompatiblesCgms.md) prior to the steps listed below 
 
 
@@ -50,7 +50,7 @@ A private repository gets 2000 free GitHub Actions minutes per month, which is e
 **New key or existing key: this decides whether you can update AAPS.**
 
 - **You already have AAPS on your phone, built with a keystore you still have**: choose **I already have a keystore** on the setup page and upload it. Your next build will update AAPS in place.
-- **You build AAPS for the first time, or you lost your keystore or its password**: choose **Create a new key**. An app signed with a new key **cannot update** an AAPS signed with another key. You must [export your settings](#ExportImportSettings-Automating-Settings-Export), copy the file off your phone, uninstall the old AAPS, install the new one, then [import your settings](#ExportImportSettings-restoring-from-your-backups-on-a-new-phone-or-fresh-installation-of-aaps).
+- **You build AAPS for the first time, or you lost your keystore or its password**: choose **Create a new key**. An app signed with a new key **cannot update** an AAPS signed with another key. You must export your settings, copy the file off your phone, uninstall the old AAPS, install the new one, then import your settings: see [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 
 Always keep using the same key afterwards. When you create a new key, download the backup the page offers and store it with its password somewhere safe, off your phone.
 ```
 
@@ -25,14 +25,7 @@ Choose this if **any** of these is true:
 - You have forgotten your keystore password or alias.
 
 ```{warning}
-Building AAPS with **Option 1** creates a brand-new keystore, so it **will not allow you to upgrade your existing AAPS** in place. To move to this new build you will need to:
-1. [Export settings](#ExportImportSettings-Automating-Settings-Export) on your phone.
-2. Copy or upload the settings file from your phone to an external location (i.e. your computer, cloud storage service…).
-3. Generate a new version of the signed apk as described in Option 1 and transfer it to your phone.
-4. Uninstall previous AAPS version on your phone.
-5. Install new AAPS version on your phone.
-6. [Import settings](#ExportImportSettings-restoring-from-your-backups-on-a-new-phone-or-fresh-installation-of-aaps) to restore your objectives and configuration.
-7. Restore your data from Nightscout.
+Building AAPS with **Option 1** creates a brand-new keystore, so it **will not allow you to upgrade your existing AAPS** in place. To move to this new build you must export your settings, uninstall the old AAPS, install the new one and import your settings again. Follow the steps in [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 ```
 
 **→ [Continue with Option 1 – Generate a new keystore](BrowserBuildO1.md)**
 
@@ -44,7 +44,7 @@ Each build method has its own troubleshooting section:
 * **Browser build** from a computer or an iPhone: [Browser build troubleshooting](#aaps-ci-troubleshooting)
 * **Android Studio**: [Troubleshooting Android Studio](../GettingHelp/TroubleshootingAndroidStudio.md)
 
-Lost your keystore or its password? See [Lost keystore](#troubleshooting_androidstudio-lost-keystore).
+Lost your keystore or its password? See [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 
 If the app is built but does not install on your phone, see [Transferring and installing AAPS](TransferringAndInstallingAaps.md).
 
 
@@ -379,7 +379,7 @@ Make sure to note down for yourself where your keystore is stored. You will need
 
 * Now choose a simple password (and make a note of it), enter it in the password box (2), and confirm it (2).  
 
-  The passwords for key store and key do not have to be sophisticated. If you lose your password in the future, see [troubleshooting for lost key store](#troubleshooting_androidstudio-lost-keystore).
+  The passwords for key store and key do not have to be sophisticated. If you lose your password in the future, see [Reinstalling AAPS with a new keystore](#reinstall-aaps).
 
 ```{warning}
 **Avoid special characters in your passwords.** Use only letters and digits for the keystore and key passwords. In particular, do not use `$`, a backtick, `"` or `\`. If you later switch to the [Browser build](#aaps-ci-option2) and reuse this keystore, these characters can make the signing step fail, see [Browser build troubleshooting](#aaps-ci-password-special-characters).
 
@@ -186,6 +186,7 @@ Troubleshooting (start here) <./GettingHelp/GeneralTroubleshooting.md>
 - Troubleshooting NSClient <./GettingHelp/TroubleshootingNsClient.md>
 - Troubleshooting Android Studio <./GettingHelp/TroubleshootingAndroidStudio.md>
 - Browser build troubleshooting <./GettingHelp/BrowserBuildTroubleshooting.md>
+- Reinstalling AAPS (new keystore) <./GettingHelp/ReinstallAaps.md>
 - Accessing logfiles <./GettingHelp/AccessingLogFiles.md>
 FAQ <./UsefulLinks/FAQ.md>
 Profile Tuning Guide <./GettingHelp/ProfileTuning.md>