diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 19db5f5..f67a46d 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -2,64 +2,60 @@ name: CI
 
 on:
   push:
-    branches: ["**"]
+    branches:
+      - "**"
 
 jobs:
   backend:
-    name: Backend tests (Maven)
-    runs-on: ['ubuntu-latest']
-    container:
-      image: maven:3.9.12-eclipse-temurin-21
+    name: Backend tests (Maven / Java 21)
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+          cache: maven
+
       - name: Show runner info
         run: |
           echo "Runner name: ${{ runner.name }}"
           echo "Runner labels: ${{ toJSON(runner.labels) }}"
-
-      - name: Cache Maven
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          java -version
+          mvn -version
 
       - name: Run Maven tests
         run: mvn -B test
 
   frontend:
-    name: Frontend build (node)
-    runs-on: ['ubuntu-latest']
-    container:
-      image: node:18-bullseye
+    name: Frontend build (Node 18)
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Show runner info
-        run: |
-          echo "Runner name: ${{ runner.name }}"
-          echo "Runner labels: ${{ toJSON(runner.labels) }}"
-
-      - name: Setup Node.js
+      - name: Set up Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: '18'
+          cache: npm
+          cache-dependency-path: frontend/package-lock.json
 
-      - name: Cache node modules
-        uses: actions/cache@v4
-        with:
-          path: frontend/node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('frontend/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install & Build
+      - name: Show runner info
         run: |
-          cd frontend
-          npm ci
-          npm run build
\ No newline at end of file
+          echo "Runner name: ${{ runner.name }}"
+          node -v
+          npm -v
+
+      - name: Install dependencies
+        working-directory: frontend
+        run: npm ci
+
+      - name: Build frontend
+        working-directory: frontend
+        run: npm run build