diff --git a/.github/workflows/dotnet-android.yml b/.github/workflows/dotnet-android.yml
new file mode 100644
index 0000000..60a44e7
--- /dev/null
+++ b/.github/workflows/dotnet-android.yml
@@ -0,0 +1,36 @@
+name: Android
+
+on:
+  push:
+
+jobs:
+
+  build:
+    name: Build and create APK
+
+    strategy:
+      matrix:
+        configuration: [Debug, Release]
+
+    runs-on: ubuntu-24.04
+
+    env:
+      App_Project_Directory: src/Vocup.Android
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    # Install .NET SDK
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+
+    - name: Restore NuGet packages
+      run: dotnet restore --configuration ${{ matrix.configuration }} $App_Project_Directory
+
+    - name: Build and create APK
+      run: dotnet build --no-restore --configuration ${{ matrix.configuration }} $App_Project_Directory
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-windows.yml
similarity index 98%
rename from .github/workflows/dotnet-desktop.yml
rename to .github/workflows/dotnet-windows.yml
index c1507e7..078909b 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-windows.yml
@@ -1,4 +1,4 @@
-name: Windows Forms build and package
+name: Windows
 
 on:
   push:
@@ -6,6 +6,7 @@ on:
 jobs:
 
   build:
+    name: Build and package MSIX
 
     strategy:
       matrix:
@@ -25,7 +26,7 @@ jobs:
       with:
         fetch-depth: 0
 
-    # Install the .NET Core workload
+    # Install .NET SDK
     - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with: