diff --git a/.github/workflows/build-flutter-release.yml b/.github/workflows/build-flutter-release.yml
index 6708586..2938dd5 100644
--- a/.github/workflows/build-flutter-release.yml
+++ b/.github/workflows/build-flutter-release.yml
@@ -1,9 +1,7 @@
 name: build-flutter-release
 
 on:
-  push:
-    branches:
-      - v2
+  workflow_dispatch:
 
 jobs:
   build-apk:
diff --git a/.github/workflows/build-flutter.yml b/.github/workflows/build-flutter.yml
index 10feb90..7a24bd0 100644
--- a/.github/workflows/build-flutter.yml
+++ b/.github/workflows/build-flutter.yml
@@ -2,8 +2,9 @@ name: build-flutter
 
 on:
   push:
-    branches:
-      - v2
+    branches: ['main']
+  pull_request:
+    branches: ['main']
 
 jobs:
   build-apk:
diff --git a/.github/workflows/build-release-debugsign.yml b/.github/workflows/build-release-debugsign.yml
deleted file mode 100644
index 70137bc..0000000
--- a/.github/workflows/build-release-debugsign.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: build-release-debugsign
-
-on:
-  push:
-    paths-ignore:
-      - assets/**
-      - .vscode/**
-      - .eslintrc.js
-      - .prettierrc.js
-      - BUILDING.md
-      - README.md
-      - LICENSE
-    branches:
-      - main
-      - release/*
-  pull_request:
-    paths-ignore:
-      - assets/**
-      - .vscode/**
-      - android/app/src/main/assets/custom/i18n/**
-      - .eslintrc.js
-      - .prettierrc.js
-      - BUILDING.md
-      - README.md
-      - LICENSE
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - run: |
-          rm submodules/ExoPlayer/gradle/wrapper/gradle-wrapper.jar
-
-      - uses: gradle/wrapper-validation-action@v1
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-
-      - run: |
-          yarn install --network-concurrency 1
-
-      - run: |
-          yarn lint --max-warnings 0
-
-      - run: |
-          yarn license
-
-      - run: |
-          yarn prepare-build
-
-      - uses: gradle/gradle-build-action@v1
-        with:
-          distributions-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
-          build-root-directory: android
-          arguments: assembleRelease -PsignReleaseWithDebug=true
-
-      - run: |
-          mkdir bin
-
-      - run: >
-          mv android/app/build/outputs/apk/release/app-release.apk
-          bin/subtracks-${GITHUB_SHA}.apk
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: subtracks-testing
-          path: bin/*
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
deleted file mode 100644
index d1fc44c..0000000
--- a/.github/workflows/build-release.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: build-release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - run: |
-          rm submodules/ExoPlayer/gradle/wrapper/gradle-wrapper.jar
-
-      - uses: gradle/wrapper-validation-action@v1
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-
-      - name: Get subtracks version
-        run: |
-          echo "SUBTRACKS_VERSION=$(node -e "console.log(require('./package.json').version);")" >> $GITHUB_ENV
-
-      - run: |
-          yarn install --network-concurrency 1
-
-      - run: |
-          yarn license
-
-      - run: |
-          yarn prepare-build
-
-      - name: Retrieve keystore file
-        env:
-          SUBTRACKS_KEYSTORE_BASE64: ${{ secrets.SUBTRACKS_KEYSTORE_BASE64 }}
-        run: |
-          echo "$SUBTRACKS_KEYSTORE_BASE64" | base64 --decode > android/app/subtracks.keystore
-
-      - name: Build release APK
-        env:
-          SUBTRACKS_UPLOAD_KEY_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_KEY_PASSWORD }}
-          SUBTRACKS_UPLOAD_STORE_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_STORE_PASSWORD }}
-        run: >
-          ./android/gradlew assembleRelease
-          -p android
-          -PSUBTRACKS_UPLOAD_STORE_FILE=subtracks.keystore
-          -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
-          -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
-          -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
-
-      - run: |
-          mkdir bin
-
-      - run: >
-          mv android/app/build/outputs/apk/release/app-release.apk
-          bin/subtracks-${SUBTRACKS_VERSION}.apk
-
-      - name: Build release AAB
-        env:
-          SUBTRACKS_UPLOAD_KEY_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_KEY_PASSWORD }}
-          SUBTRACKS_UPLOAD_STORE_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_STORE_PASSWORD }}
-        run: >
-          ./android/gradlew bundleRelease
-          -p android
-          -PSUBTRACKS_UPLOAD_STORE_FILE=subtracks.keystore
-          -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
-          -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
-          -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
-
-      - run: >
-          mv android/app/build/outputs/bundle/release/app-release.aab
-          bin/subtracks-${SUBTRACKS_VERSION}.aab
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: subtracks-release
-          path: bin/*