diff --git a/.woodpecker/container.yml b/.woodpecker/container.yml
index 838ccf8..4b9f7db 100644
--- a/.woodpecker/container.yml
+++ b/.woodpecker/container.yml
@@ -1,9 +1,7 @@
 ---
 when:
-  - event:
-      - pull_request
-      - tag
-  - event: push
+  - event: [pull_request, tag]
+  - event: [push, manual]
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}
 
@@ -21,8 +19,7 @@ steps:
       provenance: false
       repo: thegeeklab/${CI_REPO_NAME}
     when:
-      - event:
-        - pull_request
+      - event: [pull_request]
 
   publish-dockerhub:
     group: build
@@ -42,9 +39,8 @@ steps:
       username:
         from_secret: docker_username
     when:
-      - event:
-          - tag
-      - event: push
+      - event: [tag]
+      - event: [push, manual]
         branch:
           - ${CI_REPO_DEFAULT_BRANCH}
 
@@ -67,11 +63,11 @@ steps:
       username:
         from_secret: quay_username
     when:
-      - event:
-          - tag
-      - event: push
+      - event: [tag]
+      - event: [push, manual]
         branch:
           - ${CI_REPO_DEFAULT_BRANCH}
 
+
 depends_on:
   - test
diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml
index 5f2fa07..93b6f1d 100644
--- a/.woodpecker/notify.yml
+++ b/.woodpecker/notify.yml
@@ -1,13 +1,11 @@
 ---
 when:
-  - event:
-      - tag
-  - event: push
+  - event: [tag]
+  - event: [push, manual]
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}
-runs_on:
-  - success
-  - failure
+
+runs_on: [success, failure]
 
 steps:
   matrix:
@@ -19,13 +17,14 @@ steps:
         from_secret: matrix_password
       roomid:
         from_secret: matrix_roomid
-      template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
+      template: >-
+        Status: **{{ .Build.Status }}**<br/>
+        Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/>
+        Message: {{ .Commit.Message.Title }}"
       username:
         from_secret: matrix_username
     when:
-      - status:
-        - success
-        - failure
+      - status: [success, failure]
 
 depends_on:
   - test
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
index a470152..a431ae6 100644
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -1,9 +1,7 @@
 ---
 when:
-  - event:
-      - pull_request
-      - tag
-  - event: push
+  - event: [pull_request, tag]
+  - event: [push, manual]
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}
 
@@ -37,8 +35,7 @@ steps:
       overwrite: true
       title: ${CI_COMMIT_TAG}
     when:
-    - event:
-      - tag
+    - event: [tag]
 
 depends_on:
   - test
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index ab38d75..7660679 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -1,9 +1,7 @@
 ---
 when:
-  - event:
-      - pull_request
-      - tag
-  - event: push
+  - event: [pull_request, tag]
+  - event: [push, manual]
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}