diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 795a781..a5b2aca 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,33 +1,35 @@
-name: Build & Deploy MinAttest
+name: Build & Push MinAttest
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
 
 jobs:
-  build:
-    runs-on: self-hosted
+  build-and-push:
+    runs-on: docker   # matcher labelen på runneren din
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Log in to Gitea Container Registry
-        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login gitea.theriise.net -u steinhelge --password-stdin
+        run: |
+          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login gitea.theriise.net -u steinhelge --password-stdin
 
-      #
-      # Frontend
-      #
+      # ---------- Frontend ----------
       - name: Build Frontend
         run: |
-          docker build -t gitea.theriise.net/steinhelge/minattest-frontend:latest frontend
+          docker build \
+            -t gitea.theriise.net/steinhelge/minattest-frontend:latest \
+            -f frontend/minattest-app/Dockerfile \
+            frontend/minattest-app
 
       - name: Push Frontend
-        run: docker push gitea.theriise.net/steinhelge/minattest-frontend:latest
+        run: |
+          docker push gitea.theriise.net/steinhelge/minattest-frontend:latest
 
-      #
-      # Backend API
-      #
+      # ---------- Backend API ----------
       - name: Build API
         run: |
           docker build \
@@ -36,18 +38,17 @@ jobs:
             backend
 
       - name: Push API
-        run: docker push gitea.theriise.net/steinhelge/minattest-api:latest
+        run: |
+          docker push gitea.theriise.net/steinhelge/minattest-api:latest
 
-      #
-      # App-host (BFF)
-      #
+      # ---------- App Host / BFF ----------
       - name: Build App Host
         run: |
           docker build \
-            -t gitea.theriise.net/steinhelge/minattest-apphost:latest \
-            -f app-host/Dockerfile \
-            app-host
+            -t gitea.theriise.net/steinhelge/minattest-app-host:latest \
+            -f frontend/minattest-app-host/Dockerfile \
+            frontend/minattest-app-host
 
       - name: Push App Host
-        run: docker push gitea.theriise.net/steinhelge/minattest-apphost:latest
-
+        run: |
+          docker push gitea.theriise.net/steinhelge/minattest-app-host:latest