diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
new file mode 100644
index 0000000..ba2ddfc
--- /dev/null
+++ b/.github/workflows/deploy-dev.yml
@@ -0,0 +1,38 @@
+name: Deploy website to dev server
+
+on:
+ push:
+   branches-ignore:
+     - main
+ pull_request:
+   branches-ignore:
+     - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-22.04
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true  # Fetch Hugo themes (true OR recursive)
+          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: '0.119.0'
+          extended: true
+
+      - name: Build
+        run: hugo --minify -b $URL_DEVELOPMENT/$GITHUB_REF_NAME --destination dev/$GITHUB_REF_NAME
+            
+      - name: Deploy
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.PRODUCTION_SERVER }}
+          username: ${{ secrets.PRODUCTION_USERNAME }}
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          source: "dev/${{ github.ref.name }}"
+          target: ${{ WEBROOT_DEVELOPMENT}}
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy-prod.yml
similarity index 88%
rename from .github/workflows/deploy.yml
rename to .github/workflows/deploy-prod.yml
index d303d3b..b3f6223 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -1,9 +1,9 @@
-name: Deploy Website
+name: Deploy website to production server
 
 on:
   push:
     branches:
-      - hugo  # Set a branch to deploy
+      - main
   pull_request:
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
           extended: true
 
       - name: Build
-        run: hugo --minify -b https://website.ff.berlin
+        run: hugo --minify -b $URL_PRODUCTION
             
       - name: Deploy
         uses: appleboy/scp-action@master