diff --git a/.github/workflows/pullrequest_android.yml b/.github/workflows/pullrequest_android.yml
index 155c4507..dbedfad1 100644
--- a/.github/workflows/pullrequest_android.yml
+++ b/.github/workflows/pullrequest_android.yml
@@ -8,32 +8,32 @@ on:
 env:
   DOTNET_NOLOGO: true                     # Disable the .NET logo
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
-  DOTNET_CLI_TELEMETRY_OPTOUT: true       # Disable sending .NET CLI telemetry
+  DOTNET_CLI_TELEMETRY_OPTOUT: true       # Disable sending .NET CLI telemetry  
 
 jobs:
   # MAUI Android Build
   build-android:
-    runs-on: self-hosted
+    runs-on: windows-2022
     name: Android Build
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      #- name: Setup .NET 6
-      #  uses: actions/setup-dotnet@v1
-      #  with:
-      #    dotnet-version: 6.0.200-preview.22055.15
-      #    include-prerelease: true
+      - name: Setup .NET 6
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.200-preview.22055.15
+          include-prerelease: true
           
-      #- uses: actions/setup-java@v2
-      #  with:
-      #    distribution: 'microsoft'
-      #    java-version: '11'
-
-      #- name: Install MAUI Workloads
-      #  run: |
-      #    dotnet workload install android --ignore-failed-sources
-      #    dotnet workload install maui --ignore-failed-sources
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'microsoft'
+          java-version: '11'
+
+      - name: Install MAUI Workloads
+        run: |
+          dotnet workload install android --ignore-failed-sources
+          dotnet workload install maui --ignore-failed-sources
 
       - name: Restore Dependencies
         run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
diff --git a/.github/workflows/pullrequest_ios.yml b/.github/workflows/pullrequest_ios.yml
index c1661bb8..07db90f8 100644
--- a/.github/workflows/pullrequest_ios.yml
+++ b/.github/workflows/pullrequest_ios.yml
@@ -25,22 +25,24 @@ jobs:
           dotnet-version: 6.0.200-preview.22055.15
           include-prerelease: true
 
-      #- name: Install MAUI Workloads
-      #  run: |
-      #    dotnet workload install ios --ignore-failed-sources
-      #    dotnet workload install maui --ignore-failed-sources
-
-      #- name: Restore Dependencies
-      #  run: dotnet restore TransactionMobile.Maui.sln
-
-      #- name: Build Code
-      #  run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-ios --no-restore
-
-      #- name: Run Unit Tests
-      #  run: dotnet test TransactionMobile.Maui.Tests/TransactionMobile.Maui.Tests.csproj
-
-      #- name: Upload iOS Artifact
-      #  uses: actions/upload-artifact@v2.3.1
-      #  with:
-      #    name: ios-ci-build
-      #    path: src/MauiBeach/bin/Release/net6.0-ios/**/*.app/
+      #- run: dotnet tool update -g dotnet-vs
+      
+      - name: Install MAUI Workloads
+        run: |
+          dotnet workload install ios --ignore-failed-sources
+          dotnet workload install maui --ignore-failed-sources
+
+      - name: Restore Dependencies
+        run: dotnet restore TransactionMobile.Maui.sln
+        
+      - name: Build Code
+        run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-ios --no-restore
+        
+      - name: Run Unit Tests
+        run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
+
+#      #- name: Upload iOS Artifact
+#      #  uses: actions/upload-artifact@v2.3.1
+#      #  with:
+#      #    name: ios-ci-build
+#      #    path: src/MauiBeach/bin/Release/net6.0-ios/**/*.app/
diff --git a/.github/workflows/pullrequest_maccatalyst.yml b/.github/workflows/pullrequest_maccatalyst.yml
index 82ee16e1..2345c252 100644
--- a/.github/workflows/pullrequest_maccatalyst.yml
+++ b/.github/workflows/pullrequest_maccatalyst.yml
@@ -25,19 +25,31 @@ jobs:
           dotnet-version: 6.0.200-preview.22055.15
           include-prerelease: true
 
-#      - name: Install MAUI Workloads
-#        run: |
-#          dotnet workload install maccatalyst --ignore-failed-sources
-#          dotnet workload install maui --ignore-failed-sources
-
-#      - name: Restore Dependencies
-#        run: dotnet restore TransactionMobile.Maui.sln
+      - name: Setup .NET 6
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+          include-prerelease: true
 
-#      - name: Build Code
-#        run: dotnet build TransactionMobile.Maui.sln -c Release -f net6.0-maccatalyst --no-restore
+      #- run: dotnet tool update -g dotnet-vs
+      
+      - name: Install MAUI Workloads
+        run: |
+          dotnet workload install maccatalyst --ignore-failed-sources
+          dotnet workload install maui --ignore-failed-sources
+
+      - name: Restore Dependencies
+        run: dotnet restore TransactionMobile.Maui.sln
+        
+      - name: Build Code
+        run: dotnet build TransactionMobile.Maui/TransactionMobile.Maui.csproj -c Release -f net6.0-maccatalyst --no-restore
+        
+      - name: Run Unit Tests
+        run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
 
 #      #- name: Upload MacCatalyst Artifact
 #      #  uses: actions/upload-artifact@v2.3.1
 #      #  with:
 #      #    name: macos-ci-build
 #      #    path: src/MauiBeach/bin/Release/net6.0-maccatalyst/**/*.app/
+
diff --git a/.github/workflows/pullrequest_windows.yml b/.github/workflows/pullrequest_windows.yml
index d6b4b2c4..5582c4f3 100644
--- a/.github/workflows/pullrequest_windows.yml
+++ b/.github/workflows/pullrequest_windows.yml
@@ -9,35 +9,41 @@ env:
   DOTNET_NOLOGO: true                     # Disable the .NET logo
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable the .NET first time experience
   DOTNET_CLI_TELEMETRY_OPTOUT: true       # Disable sending .NET CLI telemetry
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
 jobs:
   build-windows:
-    runs-on: self-hosted
+    runs-on: windows-2022
     name: Windows Build
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      #- name: Setup .NET 6
-      #  uses: actions/setup-dotnet@v1
-      #  with:
-      #    dotnet-version: 6.0.200-preview.22055.15
-      #    include-prerelease: true
-
-      #- name: Setup MSBuild
-      #  uses: microsoft/setup-msbuild@v1.1
-      #  with:
-      #    vs-prerelease: true
-
-      #- name: Install MAUI Workloads
-      #  run: |
-      #    dotnet workload install maui --ignore-failed-sources
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+        with:
+          vs-prerelease: true
+          msbuild-architecture: x64
+
+      - name: Setup .NET 6
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.200-preview.22055.15
+          include-prerelease: true
+                 
+      - run: dotnet tool update -g dotnet-vs
+      - run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools
+      
+      - name: Install MAUI Workloads
+        run: |
+          dotnet workload install maui --ignore-failed-sources
 
       - name: Restore Dependencies
         run: dotnet restore TransactionMobile.Maui.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json
 
       - name: Build Code
-        run: msbuild TransactionMobile.Maui.sln  -restore -p:Configuration=Release  -p:TargetFramework=net6.0-windows10.0.19041  /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json 
+        run: |
+          "C:/Program Files/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe TransactionMobile.Maui/TransactionMobile.Maui.csproj -r -p:Configuration=Release -p:RestorePackages=true -p:TargetFramework=net6.0-windows10.0.19041 /p:RestoreSources=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json"
 
       - name: Run Unit Tests
         run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
diff --git a/TransactionMobile.Maui/Platforms/iOS/Info.plist b/TransactionMobile.Maui/Platforms/iOS/Info.plist
index d675f560..450d0647 100644
--- a/TransactionMobile.Maui/Platforms/iOS/Info.plist
+++ b/TransactionMobile.Maui/Platforms/iOS/Info.plist
@@ -28,12 +28,6 @@
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/appicon.appiconset</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.transactionprocessing.pos</string>
-	<key>CFBundleDisplayName</key>
-	<string>Transaction Processing POS</string>
 	<key>CFBundleName</key>
 	<string>Transaction Processing POS</string>
 </dict>
diff --git a/TransactionMobile.Maui/TransactionMobile.Maui.csproj b/TransactionMobile.Maui/TransactionMobile.Maui.csproj
index aaa36385..8ae0b897 100644
--- a/TransactionMobile.Maui/TransactionMobile.Maui.csproj
+++ b/TransactionMobile.Maui/TransactionMobile.Maui.csproj
@@ -12,9 +12,11 @@
 
 		<!-- Display name -->
 		<ApplicationTitle>Transaction Processing POS</ApplicationTitle>
+		<!--<ApplicationTitle>MAUI Beach</ApplicationTitle>-->
 
 		<!-- App Identifier -->
 		<ApplicationId>com.transactionprocessing.pos</ApplicationId>
+		<!--<ApplicationId>com.taranissoftware.MauiBeach</ApplicationId>-->
 
 		<!-- Versions -->
 		<ApplicationVersion>1</ApplicationVersion>
@@ -165,7 +167,7 @@
 		<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
+	<!--<PropertyGroup Condition="$(TargetFramework.Contains('-ios'))">
 		<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
-	</PropertyGroup>
+	</PropertyGroup>-->
 </Project>