diff --git a/.github/workflows/test-avd.yml b/.github/workflows/test-avd.yml
index 09e5e47..9fd2ca5 100644
--- a/.github/workflows/test-avd.yml
+++ b/.github/workflows/test-avd.yml
@@ -56,6 +56,8 @@ jobs:
         if: always()
         working-directory: "${{ github.workspace }}"
         run: |
+          $AzureRegionName = ${env:AZUREREGIONNAME}
+          $SecureVars = ${env:SECUREVARS} | ConvertFrom-Json
           Import-Module -Name "Pester" -Force -ErrorAction "Stop"
           $Config = New-PesterConfiguration
           $Config.Run.Path = "$Env:GITHUB_WORKSPACE\tests\scripts"
diff --git a/configs/Microsoft365Apps-Outlook-Shared.xml b/configs/Microsoft365Apps-Outlook-Shared.xml
new file mode 100644
index 0000000..c6f5565
--- /dev/null
+++ b/configs/Microsoft365Apps-Outlook-Shared.xml
@@ -0,0 +1,74 @@
+<Configuration ID="68523f69-0702-4110-9751-6aee45124635">
+  <Info Description="Microsoft 365 Apps for enterprise 64-bit including Microsoft Word, Excel, PowerPoint, Outlook, OneNote, OneDrive, Teams, Visio and Project. Configured with shared computer licensing and hardware acceleration configured for virtual desktop environments." />
+  <Add OfficeClientEdition="64" Channel="Current" MigrateArch="TRUE">
+    <Product ID="O365ProPlusRetail">
+      <Language ID="MatchOS" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Access" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="Publisher" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="Teams" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+    </Product>
+    <Product ID="VisioProRetail">
+      <Language ID="MatchOS" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Access" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="Publisher" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="Teams" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+    </Product>
+    <Product ID="ProjectProRetail">
+      <Language ID="MatchOS" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Access" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="Publisher" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="Teams" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Bing" />
+    </Product>
+  </Add>
+  <Property Name="SharedComputerLicensing" Value="1" />
+  <Property Name="FORCEAPPSHUTDOWN" Value="FALSE" />
+  <Property Name="DeviceBasedLicensing" Value="0" />
+  <Property Name="SCLCacheOverride" Value="0" />
+  <Property Name="TenantId" Value="671563ba-62bf-48be-9120-17075aaaa1cc" />
+  <Updates Enabled="FALSE" />
+  <RemoveMSI />
+  <AppSettings>
+    <Setup Name="Company" Value="Insentra" />
+    <User Key="software\microsoft\office\16.0\common\toolbars" Name="customuiroaming" Value="1" Type="REG_DWORD" App="office16" Id="L_AllowRoamingQuickAccessToolBarRibbonCustomizations" />
+    <User Key="software\microsoft\office\16.0\common\general" Name="shownfirstrunoptin" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableOptinWizard" />
+    <User Key="software\microsoft\office\16.0\common\languageresources" Name="installlanguage" Value="3081" Type="REG_SZ" App="office16" Id="L_PrimaryEditingLanguage" />
+    <User Key="software\microsoft\office\16.0\common\languageresources" Name="preferrededitinglanguage" Value="en-AU" Type="REG_SZ" App="office16" Id="L_PrimaryEditingLanguage" />
+    <User Key="software\microsoft\office\16.0\common\fileio" Name="disablelongtermcaching" Value="0" Type="REG_DWORD" App="office16" Id="L_DeleteFilesFromOfficeDocumentCache" />
+    <User Key="software\microsoft\office\16.0\common\general" Name="disablebackgrounds" Value="0" Type="REG_DWORD" App="office16" Id="L_DisableBackgrounds" />
+    <User Key="software\microsoft\office\16.0\firstrun" Name="disablemovie" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableMovie" />
+    <User Key="software\microsoft\office\16.0\firstrun" Name="bootedrtm" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableOfficeFirstrun" />
+    <User Key="software\microsoft\office\16.0\common" Name="default ui theme" Value="0" Type="REG_DWORD" App="office16" Id="L_DefaultUIThemeUser" />
+    <User Key="software\microsoft\office\16.0\excel\options" Name="defaultformat" Value="51" Type="REG_DWORD" App="excel16" Id="L_SaveExcelfilesas" />
+    <User Key="software\microsoft\office\16.0\onenote\options\other" Name="runsystemtrayapp" Value="0" Type="REG_DWORD" App="onent16" Id="L_AddOneNoteicontonotificationarea" />
+    <User Key="software\microsoft\office\16.0\outlook\preferences" Name="disablemanualarchive" Value="1" Type="REG_DWORD" App="outlk16" Id="L_DisableFileArchive" />
+    <User Key="software\microsoft\office\16.0\outlook\cached mode" Name="syncwindowsetting" Value="1" Type="REG_DWORD" App="outlk16" Id="L_CachedExchangeModeSyncSlider" />
+    <User Key="software\microsoft\office\16.0\outlook\cached mode" Name="syncwindowsettingdays" Value="0" Type="REG_DWORD" App="outlk16" Id="L_CachedExchangeModeSyncSlider" />
+    <User Key="software\microsoft\office\16.0\outlook\autodiscover" Name="zeroconfigexchange" Value="1" Type="REG_DWORD" App="outlk16" Id="L_AutomaticallyConfigureProfileBasedOnActive" />
+    <User Key="software\microsoft\office\16.0\outlook\options\rss" Name="disable" Value="1" Type="REG_DWORD" App="outlk16" Id="L_TurnoffRSSfeature" />
+    <User Key="software\microsoft\office\16.0\outlook\setup" Name="disableroamingsettings" Value="0" Type="REG_DWORD" App="outlk16" Id="L_DisableRoamingSettings" />
+    <User Key="software\microsoft\office\16.0\powerpoint\options" Name="defaultformat" Value="27" Type="REG_DWORD" App="ppt16" Id="L_SavePowerPointfilesas" />
+    <User Key="software\microsoft\office\16.0\word\options" Name="defaultformat" Value="" Type="REG_SZ" App="word16" Id="L_SaveWordfilesas" />
+  </AppSettings>
+  <Display Level="None" AcceptEULA="TRUE" />
+</Configuration>
\ No newline at end of file
diff --git a/configs/Microsoft365Apps-Validation.xml b/configs/Microsoft365Apps-Validation.xml
new file mode 100644
index 0000000..dfc60e7
--- /dev/null
+++ b/configs/Microsoft365Apps-Validation.xml
@@ -0,0 +1,50 @@
+<Configuration ID="68523f69-0702-4110-9751-6aee45124635">
+  <Info Description="Microsoft 365 Apps for enterprise 64-bit including Microsoft Word, Excel, PowerPoint, Outlook, OneNote, OneDrive, Teams, Visio and Project. Configured with shared computer licensing and hardware acceleration configured for virtual desktop environments." />
+  <Add OfficeClientEdition="64" Channel="Current" MigrateArch="TRUE">
+    <Product ID="O365ProPlusRetail">
+      <Language ID="MatchOS" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Access" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="Publisher" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="Teams" />
+      <ExcludeApp ID="Bing" />
+      <ExcludeApp ID="Outlook" />
+      <ExcludeApp ID="OneNote" />
+      <ExcludeApp ID="PowerPoint" />
+      <ExcludeApp ID="Excel" />
+    </Product>
+  </Add>
+  <Property Name="SharedComputerLicensing" Value="1" />
+  <Property Name="FORCEAPPSHUTDOWN" Value="FALSE" />
+  <Property Name="DeviceBasedLicensing" Value="0" />
+  <Property Name="SCLCacheOverride" Value="0" />
+  <Property Name="TenantId" Value="671563ba-62bf-48be-9120-17075aaaa1cc" />
+  <Updates Enabled="FALSE" />
+  <RemoveMSI />
+  <AppSettings>
+    <Setup Name="Company" Value="Insentra" />
+    <User Key="software\microsoft\office\16.0\common\toolbars" Name="customuiroaming" Value="1" Type="REG_DWORD" App="office16" Id="L_AllowRoamingQuickAccessToolBarRibbonCustomizations" />
+    <User Key="software\microsoft\office\16.0\common\general" Name="shownfirstrunoptin" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableOptinWizard" />
+    <User Key="software\microsoft\office\16.0\common\languageresources" Name="installlanguage" Value="3081" Type="REG_SZ" App="office16" Id="L_PrimaryEditingLanguage" />
+    <User Key="software\microsoft\office\16.0\common\languageresources" Name="preferrededitinglanguage" Value="en-AU" Type="REG_SZ" App="office16" Id="L_PrimaryEditingLanguage" />
+    <User Key="software\microsoft\office\16.0\common\fileio" Name="disablelongtermcaching" Value="0" Type="REG_DWORD" App="office16" Id="L_DeleteFilesFromOfficeDocumentCache" />
+    <User Key="software\microsoft\office\16.0\common\general" Name="disablebackgrounds" Value="0" Type="REG_DWORD" App="office16" Id="L_DisableBackgrounds" />
+    <User Key="software\microsoft\office\16.0\firstrun" Name="disablemovie" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableMovie" />
+    <User Key="software\microsoft\office\16.0\firstrun" Name="bootedrtm" Value="1" Type="REG_DWORD" App="office16" Id="L_DisableOfficeFirstrun" />
+    <User Key="software\microsoft\office\16.0\common" Name="default ui theme" Value="0" Type="REG_DWORD" App="office16" Id="L_DefaultUIThemeUser" />
+    <User Key="software\microsoft\office\16.0\excel\options" Name="defaultformat" Value="51" Type="REG_DWORD" App="excel16" Id="L_SaveExcelfilesas" />
+    <User Key="software\microsoft\office\16.0\onenote\options\other" Name="runsystemtrayapp" Value="0" Type="REG_DWORD" App="onent16" Id="L_AddOneNoteicontonotificationarea" />
+    <User Key="software\microsoft\office\16.0\outlook\preferences" Name="disablemanualarchive" Value="1" Type="REG_DWORD" App="outlk16" Id="L_DisableFileArchive" />
+    <User Key="software\microsoft\office\16.0\outlook\cached mode" Name="syncwindowsetting" Value="1" Type="REG_DWORD" App="outlk16" Id="L_CachedExchangeModeSyncSlider" />
+    <User Key="software\microsoft\office\16.0\outlook\cached mode" Name="syncwindowsettingdays" Value="0" Type="REG_DWORD" App="outlk16" Id="L_CachedExchangeModeSyncSlider" />
+    <User Key="software\microsoft\office\16.0\outlook\autodiscover" Name="zeroconfigexchange" Value="1" Type="REG_DWORD" App="outlk16" Id="L_AutomaticallyConfigureProfileBasedOnActive" />
+    <User Key="software\microsoft\office\16.0\outlook\options\rss" Name="disable" Value="1" Type="REG_DWORD" App="outlk16" Id="L_TurnoffRSSfeature" />
+    <User Key="software\microsoft\office\16.0\outlook\setup" Name="disableroamingsettings" Value="0" Type="REG_DWORD" App="outlk16" Id="L_DisableRoamingSettings" />
+    <User Key="software\microsoft\office\16.0\powerpoint\options" Name="defaultformat" Value="27" Type="REG_DWORD" App="ppt16" Id="L_SavePowerPointfilesas" />
+    <User Key="software\microsoft\office\16.0\word\options" Name="defaultformat" Value="" Type="REG_SZ" App="word16" Id="L_SaveWordfilesas" />
+  </AppSettings>
+  <Display Level="None" AcceptEULA="TRUE" />
+</Configuration>
\ No newline at end of file
diff --git a/variables/NerdioManagerVariables.json b/variables/NerdioManagerVariables.json
index 3b960e6..bf93413 100644
--- a/variables/NerdioManagerVariables.json
+++ b/variables/NerdioManagerVariables.json
@@ -5,18 +5,18 @@
         "TimeZone": "AUS Eastern Standard Time",
         "AppxMode": "Block",
         "FSLogixAgentVersion": "2.9.8440.42104",
-        "FSLogixAppMaskingRuleset": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppMaskingRuleset.zip",
-        "FSLogixRedirections": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Redirections.xml",
+        "FSLogixAppMaskingRuleset": "https://stybluynyickph2.blob.core.windows.net/configs/AppMaskingRuleset.zip",
+        "FSLogixRedirections": "https://stybluynyickph2.blob.core.windows.net/configs/Redirections.xml",
         "M365Channel": "Current",
-        "M365AppsConfig": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
+        "M365AppsConfig": "https://stybluynyickph2.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
         "FoxitLanguage": "English",
         "FirefoxLanguage": "en-US",
         "FirefoxChannel": "LATEST_FIREFOX_VERSION",
         "CitrixWorkspaceStream": "Current",
-        "CitrixOptimizer": "https://stavdckwuxstx4n50g.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
-        "CitrixOptimizerTemplate": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
-        "AppLockerPolicyFile": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
-        "GreenshotDefaultsIni": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/greenshot-defaults.ini",
+        "CitrixOptimizer": "https://stybluynyickph2.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
+        "CitrixOptimizerTemplate": "https://stybluynyickph2.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
+        "AppLockerPolicyFile": "https://stybluynyickph2.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
+        "GreenshotDefaultsIni": "https://stybluynyickph2.blob.core.windows.net/configs/greenshot-defaults.ini",
         "AdobeAcrobatArchitecture": "x64",
         "AdobeAcrobatLanguage": "MUI"
     },
@@ -26,17 +26,17 @@
         "TimeZone": "Pacific Standard Time",
         "AppxMode": "Block",
         "FSLogixAgentVersion": "2.9.8440.42104",
-        "FSLogixAppMaskingRuleset": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppMaskingRuleset.zip",
-        "FSLogixRedirections": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Redirections.xml",
+        "FSLogixAppMaskingRuleset": "https://stybluynyickph2.blob.core.windows.net/configs/AppMaskingRuleset.zip",
+        "FSLogixRedirections": "https://stybluynyickph2.blob.core.windows.net/configs/Redirections.xml",
         "M365Channel": "Current",
-        "M365AppsConfig": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
+        "M365AppsConfig": "https://stybluynyickph2.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
         "FoxitLanguage": "English",
         "FirefoxLanguage": "en-US",
         "CitrixWorkspaceStream": "Current",
-        "CitrixOptimizer": "https://stavdckwuxstx4n50g.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
-        "CitrixOptimizerTemplate": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
-        "AppLockerPolicyFile": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
-        "GreenshotDefaultsIni": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/greenshot-defaults.ini"
+        "CitrixOptimizer": "https://stybluynyickph2.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
+        "CitrixOptimizerTemplate": "https://stybluynyickph2.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
+        "AppLockerPolicyFile": "https://stybluynyickph2.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
+        "GreenshotDefaultsIni": "https://stybluynyickph2.blob.core.windows.net/configs/greenshot-defaults.ini"
     },
     "uksouth": {
         "Language": "en-GB",
@@ -44,16 +44,16 @@
         "TimeZone": "GMT Standard Time",
         "AppxMode": "Block",
         "FSLogixAgentVersion": "2.9.8440.42104",
-        "FSLogixAppMaskingRuleset": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppMaskingRuleset.zip",
-        "FSLogixRedirections": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Redirections.xml",
+        "FSLogixAppMaskingRuleset": "https://stybluynyickph2.blob.core.windows.net/configs/AppMaskingRuleset.zip",
+        "FSLogixRedirections": "https://stybluynyickph2.blob.core.windows.net/configs/Redirections.xml",
         "M365Channel": "Current",
-        "M365AppsConfig": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
+        "M365AppsConfig": "https://stybluynyickph2.blob.core.windows.net/configs/Microsoft365Apps-Outlook-Shared.xml",
         "FoxitLanguage": "English",
         "FirefoxLanguage": "en-GB",
         "CitrixWorkspaceStream": "Current",
-        "CitrixOptimizer": "https://stavdckwuxstx4n50g.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
-        "CitrixOptimizerTemplate": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
-        "AppLockerPolicyFile": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
-        "GreenshotDefaultsIni": "https://stavdckwuxstx4n50g.blob.core.windows.net/configs/greenshot-defaults.ini"
+        "CitrixOptimizer": "https://stybluynyickph2.blob.core.windows.net/binaries/CitrixOptimizerTool.zip",
+        "CitrixOptimizerTemplate": "https://stybluynyickph2.blob.core.windows.net/configs/CitrixOptimizer-Windows11-Lite.xml",
+        "AppLockerPolicyFile": "https://stybluynyickph2.blob.core.windows.net/configs/AppLockerRules-20231114-0803-Enforce.xml",
+        "GreenshotDefaultsIni": "https://stybluynyickph2.blob.core.windows.net/configs/greenshot-defaults.ini"
     }
 }
\ No newline at end of file