diff --git a/.github/workflows/FuelCostCalculator.yml b/.github/workflows/FuelCostCalculator.yml
index b10f61c..182da5a 100644
--- a/.github/workflows/FuelCostCalculator.yml
+++ b/.github/workflows/FuelCostCalculator.yml
@@ -11,19 +11,58 @@ on:
     branches: [ "master" ]
 
 jobs:
-  build:
-    runs-on: windows-latest
+  build-windows:
+    runs-on: windows-2022
+    name: Windows Build
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 8.0.x
-    - name: Install .NET MAUI workload
-      run: dotnet workload install maui
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Install MAUI Workloads
+        run: |
+          dotnet workload install maui --ignore-failed-sources
+
+      - name: Restore Dependencies
+        run: dotnet restore FuelCostCalculator/FuelCostCalculator.csproj
+
+      - name: Build MAUI Windows
+        run: dotnet publish FuelCostCalculator/FuelCostCalculator.csproj -c Release -f net8.0-windows10.0.19041.0 --runtime win-x64 --no-restore 
+      
+      - name: Upload Windows Artifact
+        uses: actions/upload-artifact@v2.3.1
+        with:
+          name: windows-ci-build
+          path: FuelCostCalculator/bin/x64/Release/net8.0-windows10.0.19041.0/win-x64/AppPackages/FuelCostCalculator_1.0.0.1_Test/FuelCostCalculator_1.0.0.1_x64.msix
+      
+
+  build-android:
+    runs-on: windows-2022
+    name: Android Build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Install MAUI Workloads
+        run: dotnet workload install maui --ignore-failed-sources
+
+      - name: Restore Dependencies
+        run: dotnet restore FuelCostCalculator/FuelCostCalculator.csproj
+
+      - name: Build MAUI Android
+        run: dotnet build FuelCostCalculator/FuelCostCalculator.csproj -c Release -f net8.0-android --no-restore
+
+      - name: Upload Android Artifact
+        uses: actions/upload-artifact@v2.3.1
+        with:
+          name: android-ci-build
+          path: FuelCostCalculator/bin/Release/net8.0-android/*Signed.a*
\ No newline at end of file
diff --git a/FuelCostCalculator/FuelCostCalculator.csproj b/FuelCostCalculator/FuelCostCalculator.csproj
index 0ec0904..4f2bec9 100644
--- a/FuelCostCalculator/FuelCostCalculator.csproj
+++ b/FuelCostCalculator/FuelCostCalculator.csproj
@@ -5,7 +5,9 @@
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
-
+		<RuntimeIdentifiers Condition=" '$(TargetFramework)' == 'net8.0-windows10.0.19041.0' ">win-x64</RuntimeIdentifiers>
+        <Platform Condition=" '$(TargetFramework)' == 'net8.0-windows10.0.19041.0' ">x64</Platform>
+        <PublishReadyToRun>false</PublishReadyToRun>
 		<!-- Note for MacCatalyst:
 		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
 		When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifier>.