diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
new file mode 100644
index 0000000..6f4e69f
--- /dev/null
+++ b/.gitea/workflows/build.yaml
@@ -0,0 +1,30 @@
+name: Build code-server
+run-name: Build code-server
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-image:
+    runs-on: [gismo.sh-edraft.de, ubuntu-latest]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Shutdown stack
+        run: docker stack rm code
+
+      - name: Build code-server image
+        run: |
+          docker image prune -f
+          chmod +x build
+          ./build
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 366468d..9b7d107 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,34 +1,16 @@
-name: Deploy on push
-run-name: Deploy on push
+name: Deploy code-server
+run-name: Deploy code-server
 on:
-  push:
-    branches:
-      - master
+  workflow_run:
+    workflows: ["Build code-server"]
+    types:
+      - completed
 
 jobs:
-  on-push-deploy_sh-edraft:
-    runs-on: [gismo.sh-edraft.de, ubuntu-latest]
+  deploy-stack:
+    runs-on: [dobby.sh-edraft.de, ubuntu-latest]
     container: catthehacker/ubuntu:act-latest
     steps:
-      - name: Setup docker
-        uses: https://github.com/papodaca/install-docker-action@main
-      - run: docker -v
-
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
-      - name: Shutdown stack
-        run: docker stack rm code
-
-      - name: Build code-server image
-        run: |
-          docker image prune -f
-          chmod +x build
-          ./build
-
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1
         with:
@@ -38,4 +20,4 @@ jobs:
           portainer-endpoint: 2
           name: code
           file: docker-compose.yml
-          variables: '{}'
+          variables: "{}"