diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc483b6f..96432bb2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,10 +3,11 @@ on:
   push:
     branches:
       - master
+      - chore/actions-fixing
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  unit-tests:
+  unit-tests-webapp:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -15,10 +16,26 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 20
+    - uses: actions/checkout@v4
     - run: npm --prefix webapp ci
     - run: npm --prefix webapp test -- --coverage
-    - run: cd api
+    - name: Analyze with SonarCloud
+      uses: sonarsource/sonarcloud-github-action@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  unit-tests-api:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
     - run: mvn test
+      working-directory: api
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1210a876..16c1e131 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,25 +1,42 @@
 name: Deploy on release
 
 on:
-  push:
-    branches:
-      - 'chore/actions-fixing'
   release:
     types: [published]
 
 jobs:
-  unit-tests:
+  unit-tests-webapp:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - run: npm --prefix webapp ci
-    - run: npm --prefix webapp test -- --coverage
-    - name: Analyze with SonarCloud
-      uses: sonarsource/sonarcloud-github-action@master
-      env:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+      - run: npm --prefix webapp ci
+      - run: npm --prefix webapp test -- --coverage
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  unit-tests-api:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - run: mvn test
+        working-directory: api
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
   e2e-tests: