diff --git a/.gitea/workflows/build-backend.yaml b/.gitea/workflows/build-backend.yaml
deleted file mode 100644
index 6f090b9..0000000
--- a/.gitea/workflows/build-backend.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: build
-
-env:
-  DOCKER_IMAGE: git.leon-hoppe.de/leon.hoppe/betteriserv-backend:latest
-
-on:
-  push:
-    branches: main
-        
-jobs:
-  build-backend:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        
-      - name: Login to Repo
-        uses: docker/login-action@v2
-        with:
-          registry: git.leon-hoppe.de
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build docker image
-        run: docker build -t ${{ env.DOCKER_IMAGE }} BetterIServ.Backend/
-
-      - name: Push docker image
-        run: docker push ${{ env.DOCKER_IMAGE }}
diff --git a/.gitea/workflows/build-frontend.yaml b/.gitea/workflows/build-frontend.yaml
deleted file mode 100644
index d3dc2d8..0000000
--- a/.gitea/workflows/build-frontend.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: build
-
-env:
-  DOCKER_IMAGE: git.leon-hoppe.de/leon.hoppe/betteriserv-frontend:latest
-
-on:
-  push:
-    branches: main
-        
-jobs:
-  build-frontend:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        
-      - name: Login to Repo
-        uses: docker/login-action@v2
-        with:
-          registry: git.leon-hoppe.de
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build docker image
-        run: docker build -t ${{ env.DOCKER_IMAGE }} BetterIServ.Mobile/
-
-      - name: Push docker image
-        run: docker push ${{ env.DOCKER_IMAGE }}
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
new file mode 100644
index 0000000..701af79
--- /dev/null
+++ b/.gitea/workflows/build.yaml
@@ -0,0 +1,51 @@
+name: build
+
+env:
+  DOCKER_IMAGE: git.leon-hoppe.de/leon.hoppe/betteriserv-frontend:latest
+
+on:
+  push:
+    branches: main
+        
+jobs:
+  build-frontend:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Login to Repo
+        uses: docker/login-action@v2
+        with:
+          registry: git.leon-hoppe.de
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build docker image
+        run: docker build -t ${{ env.DOCKER_IMAGE }}:frontend BetterIServ.Mobile/
+
+      - name: Push docker image
+        run: docker push ${{ env.DOCKER_IMAGE }}:frontend
+
+  build-backend:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Login to Repo
+        uses: docker/login-action@v2
+        with:
+          registry: git.leon-hoppe.de
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build docker image
+        run: docker build -t ${{ env.DOCKER_IMAGE }}:backend BetterIServ.Backend/
+
+      - name: Push docker image
+        run: docker push ${{ env.DOCKER_IMAGE }}:backend