diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml
index b9e6f17b2..60522f320 100644
--- a/.forgejo/workflows/buildAndTest.yml
+++ b/.forgejo/workflows/buildAndTest.yml
@@ -19,15 +19,15 @@ on:
         required: false
         type: boolean
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release/*", "hotfix/*", "fix/*" ]
   pull_request:
-    branches: [ "main", "release/*" ]
+    branches: [ "main", "release/*", "hotfix/*", "fix/*" ]
 
 jobs:
   build:
     runs-on: docker
     container:
-      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
+      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v2
     steps:
     - name: Clone yavsc
       run: |
@@ -44,17 +44,11 @@ jobs:
     - name: Secret scan
       run: |
         echo "🔍 Scanning for secrets..."
-        cd /src/_src && dotnet tool restore && dotnet picket git --verbose --redact --exit-code 1 --log-opts -n10 \
+        cd /src/_src && dotnet workloads restore && dotnet tool restore && dotnet picket git --verbose --redact --exit-code 1 --log-opts -n10 \
     - name: Build
       run: |
         echo "🏗️ Building the solution..."
         cd /src/_src && dotnet build --verbosity normal
-    - name: Install SkiaSharp native dependencies
-      run: |
-        echo "📦 Installing libfontconfig/libfreetype for SkiaSharp (Avalonia.Headless)..."
-        apt-get update && apt-get install -y --no-install-recommends \
-          libfontconfig1 libfreetype6 libexpat1 zlib1g libbz2-1.0 libpng16-16 libbrotli1 \
-          && rm -rf /var/lib/apt/lists/*
     - name: Test
       run: |
         echo "🚀 Lancement des tests..."
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 911fc831d..bf73bc3e5 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
   release:
     runs-on: docker
     container:
-      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
+      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v2
     steps:
       - name: Clone du repo au tag demandé
         env:
@@ -174,13 +174,8 @@ jobs:
       - name: Restore
         run: |
           cd /src/_src
+          sudo dotnet workloads restore
           dotnet restore
-      - name: Test
-        run: |
-          cd /src/_src && dotnet test \
-          --verbosity normal \
-          --filter="Category!=Platform-Android" \
-          --logger "xunit;LogFileName=test-results.xml"
 
       - name: Build de PostIt.Android ARM64
         run: |