diff --git a/.github/workflows/ci_beta.yml b/.github/workflows/ci_beta.yml
new file mode 100644
index 00000000..1cf58ca8
--- /dev/null
+++ b/.github/workflows/ci_beta.yml
@@ -0,0 +1,39 @@
+name: CI beta
+
+on:
+  push:
+    branches:
+      - openScale-3.0
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: android_app
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu" # See 'Supported distributions' for available options
+          java-version: "21"
+      - name: Build APK
+        run: ./gradlew assembleBeta
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "beta-build"
+          prerelease: true
+          title: "openScale 3.0 beta build"
+          files: |
+            android_app/app/build/outputs/apk/beta/openScale-beta.apk
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci_master.yml
similarity index 97%
rename from .github/workflows/ci.yml
rename to .github/workflows/ci_master.yml
index fa6de18e..23fdce69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci_master.yml
@@ -6,6 +6,8 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
+    branches:
+      'master'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -41,3 +43,4 @@ jobs:
           title: "openScale development build"
           files: |
             android_app/app/build/outputs/apk/debug/openScale-debug.apk
+
diff --git a/android_app/app/build.gradle.kts b/android_app/app/build.gradle.kts
index 7091f741..827f9286 100644
--- a/android_app/app/build.gradle.kts
+++ b/android_app/app/build.gradle.kts
@@ -36,6 +36,17 @@ android {
             manifestPlaceholders["appRoundIcon"] = "@mipmap/ic_launcher_beta_round"
         }
     }
+
+    applicationVariants.all {
+        val variant = this
+        outputs.all {
+            val output = this
+            if (output is com.android.build.gradle.internal.api.BaseVariantOutputImpl) {
+                output.outputFileName = "openScale-${variant.buildType.name}.apk"
+            }
+        }
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21