From 8d942997f2f3f62a76a14d2937a51dfa84826b5a Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Wed, 28 Sep 2022 11:08:05 -0400 Subject: [PATCH 1/6] first draft for review --- .../olympia/olympia-enrollment-guidelines.md | 147 ++++-------------- 1 file changed, 27 insertions(+), 120 deletions(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index a10b3e8bbf..e23cf20969 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -1,138 +1,45 @@ --- -title: Olympia Corp enrollment guidelines -description: Learn about the Olympia Corp enrollment and setting up an Azure Active Directory-REGISTERED Windows client device or an Azure Active Directory-JOINED Windows client device. -ms.author: aaroncz +title: Olympia Corp retirement +description: Learn about the retirement of Olympia Corp and how to back up your data prior to October 31, 2022. +ms.author: lizlong ms.topic: article -ms.prod: w10 -ms.technology: windows -author: aczechowski +ms.prod: windows-client +ms.technology: itpro-update +author: lizgt2000 ms.reviewer: -manager: dougeby +manager: aaroncz ms.custom: seo-marvel-apr2020 --- -# Olympia Corp - +# Olympia Corp Retirement + **Applies to** - Windows 10 - Windows 11 -## What is Windows Insider Lab for Enterprise and Olympia Corp? +## Retirement of Olympia Corp -Windows Insider Lab for Enterprise is intended for Windows Insiders who want to try new experimental and pre-release enterprise privacy and security features. To get the complete experience of these enterprise features, Olympia Corp, a virtual corporation has been set up to reflect the IT infrastructure of real world business. Selected customers are invited to join Olympia Corp and try these features. +Olympia Corp, a virtual corporation was set up to reflect the IT infrastructure of real world businesses. +Olympia will be formally retired on October 31, 2022. We'll begin unassigning Olympia licenses and deleting the Olympia feedback path on Feedback Hub. +Olympia Corp will no longer be a part of Windows Insider Lab for Enterprise. -As an Olympia user, you will have an opportunity to: +> [!WARNING] +> To prevent data loss, Olympia participants need to complete the following: -- Use various enterprise features like Windows Information Protection (WIP), Microsoft Defender for Office 365, Windows Defender Application Guard (WDAG), and Application Virtualization (APP-V). -- Learn how Microsoft is preparing for GDPR, as well as enabling enterprise customers to prepare for their own readiness. -- Validate and test pre-release software in your environment. -- Provide feedback. -- Interact with engineering team members through a variety of communication channels. +- If you're using the provided Olympia licenses, make a back up of any data as you'll lose data once we unassign the licenses. ->[!Note] ->Enterprise features might have reduced or different security, privacy, accessibility, availability, and reliability standards relative to commercially provided services and software. We may change or discontinue any of the enterprise features at any time without notice. +- Please remove your device from Olympia before October 31, 2022. +- To remove account from AAD, follow steps mentioned below: -For more information about Olympia Corp, see [https://olympia.windows.com/Info/FAQ](https://olympia.windows.com/Info/FAQ). +1. Open the Settings app. +1. Go to Accounts > Access work or school. +1. Select the connected account that you want to remove > Disconnect. +1. To confirm device removal, select Yes. -To request an Olympia Corp account, fill out the survey at [https://aka.ms/RegisterOlympia](https://aka.ms/RegisterOlympia). +- After removing your account from Olympia, login to your device using your local account. -## Enrollment guidelines - -Welcome to Olympia Corp. Here are the steps needed to enroll. - -As part of Windows Insider Lab for Enterprise, you can upgrade to Windows client Enterprise from Windows client Pro. This upgrade is optional. Since certain features such as Windows Defender Application Guard are only available on Windows client Enterprise, we recommend you to upgrade. - -Choose one of the following two enrollment options: - -- To set up an Azure Active Directory-registered device, [follow these steps](#enrollment-keep-current-edition). In this case, you log onto the device by using an existing (non-Olympia) account. - -- If you are running Windows client Pro, we recommend that you upgrade to Windows client Enterprise by following these steps to [set up an Azure Active Directory-joined device](#enrollment-upgrade-to-enterprise). In this case, you will be able to log on to the device with your Olympia account. - - - -### Set up an Azure Active Directory-REGISTERED Windows client device - -This is the Bring Your Own Device (BYOD) method--your device will receive Olympia policies and features, but a new account will not be created. See [Azure AD register FAQ](/azure/active-directory/devices/faq) for additional information. - -1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your device (see [local administrator](https://support.microsoft.com/windows/create-a-local-user-or-administrator-account-in-windows-20de74e0-ac7f-3502-a866-32915af2a34d)). - - ![Settings -> Accounts.](images/1-1.png) - -2. If you are already connected to a domain, select the existing account and then select **Disconnect**. Select **Restart Later**. - -3. Select **Connect** and enter your **Olympia corporate account** (for example, username@olympia.windows.com). Select **Next**. - - ![Entering account information when setting up a work or school account.](images/1-3.png) - -4. Enter the temporary password that was sent to you. Select **Sign in**. Follow the instructions to set a new password. - - > [!NOTE] - > Passwords should contain 8-16 characters, including at least one special character or number. - - ![Update your password.](images/1-4.png) - -5. Read the **Terms and Conditions**. Select **Accept** to participate in the program. - -6. If this is the first time you are logging in, fill in the additional information to help you retrieve your account details. - -7. Create a PIN for signing into your Olympia corporate account. - -8. Go to **Start > Settings > Update & Security > Windows Insider Program**. Select on the current Windows Insider account, and select **Change**. Sign in with your **Olympia corporate account**. - - > [!NOTE] - > To complete this step, you will need to register your account with the [Windows Insider Program for Business](https://insider.windows.com/ForBusiness). - -9. Open the **Feedback Hub**, and sign in with your **Olympia corporate account**. - - - -### Set up Azure Active Directory-JOINED Windows client device - -- This method will upgrade your Windows client Pro license to Enterprise and create a new account. See [Azure AD joined devices](/azure/active-directory/devices/concept-azure-ad-join) for more information. - - > [!NOTE] - > Make sure that you save your Pro license key before upgrading to the Enterprise edition. If the device gets disconnected from Olympia, you can use the Pro key to reactivate the license manually in the unlikely event that the license fails to downgrade back to Pro automatically. To reactivate manually, see [Upgrade by manually entering a product key](../../upgrade/windows-10-edition-upgrades.md#upgrade-by-manually-entering-a-product-key). - -1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your device (see [local administrator](https://support.microsoft.com/windows/create-a-local-user-or-administrator-account-in-windows-20de74e0-ac7f-3502-a866-32915af2a34d)). - - ![Settings -> Accounts.](images/1-1.png) - -2. If you are already connected to a domain, select the existing account and then select **Disconnect**. Select **Restart Later**. - -3. Select **Connect**, then select **Join this device to Azure Active Directory**. - - ![Joining device to Azure AD.](images/2-3.png) - -4. Enter your **Olympia corporate account** (e.g., username@olympia.windows.com). Select **Next**. - - ![Set up a work or school account.](images/2-4.png) - -5. Enter the temporary password that was sent to you. Select **Sign in**. Follow the instructions to set a new password. - - > [!NOTE] - > Passwords should contain 8-16 characters, including at least one special character or number. - - ![Entering temporary password.](images/2-5.png) - -6. When asked to make sure this is your organization, verify that the information is correct. If so, select **Join**. - -7. If this is the first time you are signing in, fill in the additional information to help you retrieve your account details. - -8. Create a PIN for signing into your Olympia corporate account. - -9. When asked to make sure this is your organization, verify that the information is correct. If so, select **Join**. - -10. Restart your device. - -11. In the sign-in screen, choose **Other User** and sign in with your **Olympia corporate account**. Your device will upgrade to Windows client Enterprise. - -12. Go to **Start > Settings > Update & Security > Windows Insider Program**. Select on the current Windows Insider account, and select **Change**. Sign in with your **Olympia corporate account**. - - > [!NOTE] - > To complete this step, you will need to register your account with the [Windows Insider Program for Business](https://insider.windows.com/ForBusiness). - -13. Open the **Feedback Hub**, and sign in with your **Olympia corporate account**. - ->[!NOTE] -> Your Windows client Enterprise license won't be renewed if your device isn't connected to Olympia. +- If you are looking for another program to join, the program we recommend is the Windows Insider Program for Business. Follow the instructions below to register: +[Register for the Windows 10 Insider Program for Business](/windows-insider/business/register) + +Thank you for your participation in Olympia and email Windows Insider Lab for Enterprise [olympia@microsoft.com](mailto:olympia@microsoft.com) with any questions. From a1c87895693c778ebc168183082148da7a431758 Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:27:15 -0400 Subject: [PATCH 2/6] ready for review --- .../olympia/olympia-enrollment-guidelines.md | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index e23cf20969..bc9c319ca8 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -1,5 +1,5 @@ --- -title: Olympia Corp retirement +title: Olympia Corp description: Learn about the retirement of Olympia Corp and how to back up your data prior to October 31, 2022. ms.author: lizlong ms.topic: article @@ -11,7 +11,7 @@ manager: aaroncz ms.custom: seo-marvel-apr2020 --- -# Olympia Corp Retirement +# Olympia Corp **Applies to** @@ -20,22 +20,21 @@ ms.custom: seo-marvel-apr2020 ## Retirement of Olympia Corp -Olympia Corp, a virtual corporation was set up to reflect the IT infrastructure of real world businesses. -Olympia will be formally retired on October 31, 2022. We'll begin unassigning Olympia licenses and deleting the Olympia feedback path on Feedback Hub. -Olympia Corp will no longer be a part of Windows Insider Lab for Enterprise. +Olympia Corp, a virtual corporation was set up to reflect the IT infrastructure of real world businesses.
+Olympia will be formally retired on October 31, 2022.
+We'll begin unassigning Olympia licenses and deleting the Olympia feedback path on Feedback Hub. Olympia Corp will no longer be a part of Windows Insider Lab for Enterprise. > [!WARNING] > To prevent data loss, Olympia participants need to complete the following: +> - If you're using the provided Olympia licenses, make a back up of any data as you'll lose data once we unassign the licenses. +> - Please remove your device from Olympia before October 31, 2022. -- If you're using the provided Olympia licenses, make a back up of any data as you'll lose data once we unassign the licenses. +To remove the account from Azure Active Directory, follow the steps below: -- Please remove your device from Olympia before October 31, 2022. -- To remove account from AAD, follow steps mentioned below: - -1. Open the Settings app. -1. Go to Accounts > Access work or school. -1. Select the connected account that you want to remove > Disconnect. -1. To confirm device removal, select Yes. + 1. Open the **Settings** app. + 1. Go to **Accounts** > **Access work or school**. + 1. Select the connected account that you want to remove, then select **Disconnect**. + 1. To confirm device removal, select **Yes**. - After removing your account from Olympia, login to your device using your local account. From 4af57b06a042c0324afec1f8796cf9bd70ce2a14 Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:33:04 -0400 Subject: [PATCH 3/6] fix ms.technology --- .../update/olympia/olympia-enrollment-guidelines.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index bc9c319ca8..ceab4c6dc4 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -1,10 +1,10 @@ --- -title: Olympia Corp +title: Olympia Corp Retirement description: Learn about the retirement of Olympia Corp and how to back up your data prior to October 31, 2022. ms.author: lizlong ms.topic: article ms.prod: windows-client -ms.technology: itpro-update +ms.technology: windows author: lizgt2000 ms.reviewer: manager: aaroncz From 821fc5c725d4f0d21d23956f7d0f3fa1a1bf437e Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:35:36 -0400 Subject: [PATCH 4/6] fix acrolinx suggestions --- .../update/olympia/olympia-enrollment-guidelines.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index ceab4c6dc4..3f792ada0f 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -36,9 +36,9 @@ To remove the account from Azure Active Directory, follow the steps below: 1. Select the connected account that you want to remove, then select **Disconnect**. 1. To confirm device removal, select **Yes**. -- After removing your account from Olympia, login to your device using your local account. +- After removing your account from Olympia, log in to your device using your local account. -- If you are looking for another program to join, the program we recommend is the Windows Insider Program for Business. Follow the instructions below to register: +- If you're looking for another program to join, the program we recommend is the Windows Insider Program for Business. Follow the instructions below to register: [Register for the Windows 10 Insider Program for Business](/windows-insider/business/register) Thank you for your participation in Olympia and email Windows Insider Lab for Enterprise [olympia@microsoft.com](mailto:olympia@microsoft.com) with any questions. From 2d7f0c8d9ed5f3cc41dc08540ebedd1f21bdbc7f Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:38:09 -0400 Subject: [PATCH 5/6] change ms.technology to windows-client --- .../deployment/update/olympia/olympia-enrollment-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index 3f792ada0f..9b6fe1640b 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -4,7 +4,7 @@ description: Learn about the retirement of Olympia Corp and how to back up your ms.author: lizlong ms.topic: article ms.prod: windows-client -ms.technology: windows +ms.technology: windows-client author: lizgt2000 ms.reviewer: manager: aaroncz From 7953b4dac7c330bd6da1d55a8b3df59f11a3d0c2 Mon Sep 17 00:00:00 2001 From: Liz Long <104389055+lizgt2000@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:25:33 -0400 Subject: [PATCH 6/6] fix reference --- .../update/olympia/olympia-enrollment-guidelines.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index 9b6fe1640b..b4fd53631f 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -3,12 +3,10 @@ title: Olympia Corp Retirement description: Learn about the retirement of Olympia Corp and how to back up your data prior to October 31, 2022. ms.author: lizlong ms.topic: article -ms.prod: windows-client -ms.technology: windows-client +ms.prod: w10 author: lizgt2000 ms.reviewer: manager: aaroncz -ms.custom: seo-marvel-apr2020 --- # Olympia Corp