diff --git a/.woodpecker.yml b/.woodpecker.yml
index caad7e9..eab0270 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,23 +1,27 @@
 steps:
   deploy_frontend:
     image: node:20
-    secrets: [FLY_API_TOKEN]
+    environment:
+      FLY_API_TOKEN:
+        from_secret: FLY_API_TOKEN
     commands:
       - curl -L https://fly.io/install.sh | sh
       - export PATH="$HOME/.fly/bin:$PATH"
       - flyctl deploy --config fly.toml --app gallus-pub --remote-only
-    when:
-      branch: main
-      event: push
 
-  deploy_backend:
+  build_and_deploy_backend:
     image: node:20
-    secrets: [FLY_API_TOKEN]
+    environment:
+      FLY_API_TOKEN:
+        from_secret: FLY_API_TOKEN
     commands:
       - cd backend
       - curl -L https://fly.io/install.sh | sh
       - export PATH="$HOME/.fly/bin:$PATH"
       - flyctl deploy --config fly.toml --app gallus-cms-backend --remote-only
-    when:
-      branch: main
-      event: push
+
+when:
+  branch:
+    - main
+  event:
+    - push