diff --git a/FFUDevelopment/Apps/AppList.json b/FFUDevelopment/Apps/AppList.json
index ea7e1d7..a33c2b9 100644
--- a/FFUDevelopment/Apps/AppList.json
+++ b/FFUDevelopment/Apps/AppList.json
@@ -9,6 +9,11 @@
             "name": "Company Portal",
             "id": "9WZDNCRFJ3PZ",
             "source": "msstore"
+        },
+        {
+            "name": "Microsoft Teams",
+            "id": "Microsoft.Teams",
+            "source": "winget"
         }
     ]
 }
\ No newline at end of file
diff --git a/FFUDevelopment/Apps/InstallAppsandSysprep.cmd b/FFUDevelopment/Apps/InstallAppsandSysprep.cmd
index 1fefc88..8b39b03 100644
--- a/FFUDevelopment/Apps/InstallAppsandSysprep.cmd
+++ b/FFUDevelopment/Apps/InstallAppsandSysprep.cmd
@@ -51,6 +51,11 @@ for /d %%D in ("%basepath%\*") do (
 )
 :remaining
 endlocal
+for /r "D:\" %%G in (.) do (
+    if exist "%%G\Notepad++" (
+        powershell -Command "Remove-AppxPackage -Package NotepadPlusPlus_1.0.0.0_neutral__7njy0v32s6xk6"
+    )
+)
 REM The below lines will remove the unattend.xml that gets the machine into audit mode. If not removed, the OS will get stuck booting to audit mode each time.
 REM Also kills the sysprep process in order to automate sysprep generalize
 del c:\windows\panther\unattend\unattend.xml /F /Q
diff --git a/FFUDevelopment/BuildFFUVM.ps1 b/FFUDevelopment/BuildFFUVM.ps1
index 8578c47..b09e4d9 100644
--- a/FFUDevelopment/BuildFFUVM.ps1
+++ b/FFUDevelopment/BuildFFUVM.ps1
@@ -1811,18 +1811,14 @@ function Get-StoreApp {
         WriteLog "$StoreAppName not found in WinGet repository. Skipping download."
         return
     }
-    # Skip the header lines and get the line with the app information
-    $appResult = $wingetSearchResult | Select-Object -Skip 2 | Select-Object -First 1
-    # Split the line by whitespace and get the second-to-last item (the Id)
-    $appID = ($appResult -split '\s+')[-2]
-    # Checking app ID to determine if store app is a win32 app
     WriteLog "Checking if $StoreAppName is a win32 app..."
-    $appIsWin32 = $appID.StartsWith("XP")
+    $appIsWin32 = $StoreAppId.StartsWith("XP")
     if ($appIsWin32) {
         WriteLog "$StoreAppName is a win32 app. Adding to $AppsPath\win32 folder"
         $appFolderPath = Join-Path -Path "$AppsPath\win32" -ChildPath $StoreAppName
     }
     else {
+        WriteLog "$StoreAppName is not a win32 app."
         $appFolderPath = Join-Path -Path "$AppsPath\MSStore" -ChildPath $StoreAppName
     }
     New-Item -Path $appFolderPath -ItemType Directory -Force | Out-Null