diff --git a/.gitea/workflows/build-android.yaml b/.gitea/workflows/build-android.yaml
index c11c5b8..b714b6c 100644
--- a/.gitea/workflows/build-android.yaml
+++ b/.gitea/workflows/build-android.yaml
@@ -1,5 +1,10 @@
-on: push
+on:
+  pull_request:
+    branches:
+      - main
+
 name: Build and release APK
+
 jobs:
   build:
     name: Build APK
@@ -9,7 +14,7 @@ jobs:
     - name: Install prerequisites
       run: |
         sudo apt-get update
-      # sudo apt-get install -y xz-utils unzip
+        sudo apt-get install -y xz-utils unzip
 
     - uses: https://gitea.com/actions/checkout@v4
 
@@ -24,8 +29,8 @@ jobs:
         flutter-version: 3.19.6
         cache: true
 
-    # - name: Setup Android SDK
-    #   uses: https://github.com/android-actions/setup-android@v3
+    - name: Setup Android SDK
+      uses: https://github.com/android-actions/setup-android@v3
 
     - run: flutter pub get
 
diff --git a/.gitea/workflows/build-web.yaml b/.gitea/workflows/build-web.yaml
index cc08a5e..cdb817c 100644
--- a/.gitea/workflows/build-web.yaml
+++ b/.gitea/workflows/build-web.yaml
@@ -1,21 +1,30 @@
-on: push
-name: Test, Build and Release web
+on:
+  pull_request:
+    branches:
+      - main
+
+name: Build web
+
 jobs:
   build:
     name: Build Web
     runs-on: k8s
     steps:
+
     - name: Install prerequisites
       run: |
         sudo apt-get update
         sudo apt-get install -y xz-utils
 
     - uses: actions/checkout@v4
+
     - uses: https://github.com/subosito/flutter-action@v2
       with:
         channel: stable
         flutter-version: 3.19.6
         cache: true
-    - run: flutter pub get
-    # - run: flutter test
+
+    - run: flutter pub get
+
+    - run: flutter build web
 
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
new file mode 100644
index 0000000..7f22525
--- /dev/null
+++ b/.gitea/workflows/test.yaml
@@ -0,0 +1,31 @@
+on:
+  push:
+  pull_request:
+    branches:
+      - main
+
+
+name: Test code
+
+jobs:
+  test:
+    name: Test code
+    runs-on: k8s
+    steps:
+
+    - name: Install prerequisites
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xz-utils
+
+    - uses: actions/checkout@v4
+
+    - uses: https://github.com/subosito/flutter-action@v2
+      with:
+        channel: stable
+        flutter-version: 3.19.6
+        cache: true
+
+    - run: flutter pub get
+
+    - run: flutter test