diff --git a/.github/workflows/flutter_release.yml b/.github/workflows/flutter_release.yml
index d48e34f1..5a42ade1 100644
--- a/.github/workflows/flutter_release.yml
+++ b/.github/workflows/flutter_release.yml
@@ -93,7 +93,7 @@ jobs:
           SUPPLY_PACKAGE_NAME: '${{ secrets.ANDROID_PACKAGE_NAME }}'
           SUPPLY_JSON_KEY_DATA: '${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}'
         working-directory: android/
-        run: bundle exec fastlane android deploy
+        run: bundle exec fastlane android ${{ github.event.release.prerelease && 'beta' || 'deploy' }} 
 
       - name: Build Android App and Linux Bundle
         # Use signing keys for release instead of debug
diff --git a/.github/workflows/flutter_test.yml b/.github/workflows/flutter_test.yml
index 241e9633..9aeac923 100644
--- a/.github/workflows/flutter_test.yml
+++ b/.github/workflows/flutter_test.yml
@@ -24,6 +24,7 @@ jobs:
       linux: ${{ steps.filter.outputs.linux }}
       macos: ${{ steps.filter.outputs.macos }}
       yaml: ${{ steps.filter.outputs.yaml }}
+      windows: ${{ steps.filter.outputs.windows }}
     steps:
     # For pull requests it's not necessary to checkout the code
     - uses: dorny/paths-filter@v3
@@ -42,6 +43,8 @@ jobs:
             - 'macos/**'
           yaml:
             - '*.yaml'
+          windows:
+            - 'windows/**'
             
   android-linux-build:
     name: 'Android / Linux Build'
@@ -164,6 +167,37 @@ jobs:
       - name: Run tests
         run: flutter test
 
-      - name: Build macos release
+      - name: Build macos
         run: flutter build macos
-  
\ No newline at end of file
+
+  windows-build:
+    name: 'Windows Build'
+    needs: changes
+    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.windows == 'true' || needs.changes.outputs.yaml == 'true' }}
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Flutter action
+        uses: subosito/flutter-action@v2.8.0
+        with:
+          channel: stable
+
+      - name: Download pub dependencies
+        run: flutter pub get
+      
+      - name: Upgrade pub dependencies
+        run: flutter pub upgrade
+
+      - name: Run build_runner
+        run: flutter pub run build_runner build --delete-conflicting-outputs
+
+      - name: Run analyzer
+        run: flutter analyze
+
+      - name: Run tests
+        run: flutter test
+
+      - name: Build windows
+        run: flutter build windows
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/22.txt b/android/fastlane/metadata/android/en-US/changelogs/22.txt
new file mode 100644
index 00000000..e3d5cf53
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1 @@
+Run checks for windows and publish beta on android for prerelease publish
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
new file mode 100644
index 00000000..e3d5cf53
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1 @@
+Run checks for windows and publish beta on android for prerelease publish
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 479dcfeb..2c8915df 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A Network Analyzer
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.5+21
+version: 1.0.5+22
 
 environment:
   sdk: ">=2.17.0 <3.0.0"