diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index fc79274..5b4b9c6 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -1,12 +1,6 @@
 name: Build Zola Website
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: pull_request
 
 jobs:
   build:
@@ -25,32 +19,3 @@ jobs:
         run: |
           zola build
 
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/master' && success()
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Set up Zola
-        uses: taiki-e/install-action@v2
-        with:
-          tool: zola@0.17.2
-
-      - name: Build Zola Website
-        run: |
-          zola build
-
-      - name: Deploy to server
-        uses: AEnterprise/rsync-deploy@v1.0.2
-        env:
-          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-          ARGS: "-e -c -r --delete"
-          SERVER_PORT: 22
-          FOLDER: "./public/"
-          SERVER_IP: ${{ secrets.SERVER_IP }}
-          USERNAME: ${{ secrets.USERNAME }}
-          SERVER_DESTINATION: "/srv/www/cz/pkmples/www"
-
diff --git a/.gitea/workflows/build_and_deploy.yaml b/.gitea/workflows/build_and_deploy.yaml
new file mode 100644
index 0000000..f50c158
--- /dev/null
+++ b/.gitea/workflows/build_and_deploy.yaml
@@ -0,0 +1,36 @@
+name: Build and Deploy Zola Website
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Set up Zola
+        uses: taiki-e/install-action@v2
+        with:
+          tool: zola@0.17.2
+
+      - name: Build Zola Website
+        run: |
+          zola build
+
+      - name: Deploy to server
+        uses: AEnterprise/rsync-deploy@v1.0.2
+        env:
+          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+          ARGS: "-e -c -r --delete"
+          SERVER_PORT: 22
+          FOLDER: "./public/"
+          SERVER_IP: ${{ secrets.SERVER_IP }}
+          USERNAME: ${{ secrets.USERNAME }}
+          SERVER_DESTINATION: ${{ if(github.ref == 'refs/heads/master') }}/srv/www/cz/pkmples/www${{ else }}/srv/www/cz/pkmples/dev${{ endif }
+