diff --git a/.drone.yml b/.drone.yml
index 8c798a1..2581f2c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,6 +14,13 @@ steps:
       registry: git.autonomic.zone
       context: astro
       dockerfile: astro/Dockerfile
+    trigger: &exclude-event-custom
+      branch:
+        - main
+      event:
+        exclude:
+          - custom
+
   - name: publish payload dev container
     image: plugins/docker
     settings: &payload-build-settings
@@ -23,6 +30,9 @@ steps:
       context: payload
       dockerfile: payload/Dockerfile
       target: dev
+    trigger: 
+      >>: &exclude-event-custom
+
   - name: publish payload prod container
     image: plugins/docker
     settings:
@@ -30,6 +40,9 @@ steps:
       username: 3wordchant
       repo: git.autonomic.zone/autonomic-cooperative/astro-payload-test-payload
       target: prod
+    trigger: 
+      >>: &exclude-event-custom
+
   - name: deploy stack
     image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
@@ -50,17 +63,9 @@ steps:
       PAYLOAD_URL: "https://admin.paystro.swarm-demo.autonomic.zone"
     depends_on:
       - publish payload prod container
-trigger:
-  branch:
-    - main
-  event:
-    exclude:
-      - custom
----
-kind: pipeline
-name: build astro
+    trigger: 
+      >>: &exclude-event-custom
 
-steps:
   - name: build astro content
     image: git.autonomic.zone/autonomic-cooperative/astro-payload-test-astro:latest
     environment:
@@ -80,7 +85,3 @@ steps:
       dest: /usr/share/nginx/html/
       deploy_key:
         from_secret: drone_ssh_swarm-demo.autonomic.zone
-
-trigger:
-  event:
-    - custom