diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml
index 2a592651e..4cacd3a3a 100644
--- a/.woodpecker/binaries.yml
+++ b/.woodpecker/binaries.yml
@@ -11,15 +11,14 @@ pipeline:
       - yarn build
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/binaries.yml"
-          - "nfpm/*.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
-          # web source code
-          - "web/**"
+        # related config files
+        - ".woodpecker/binaries.yml"
+        - "nfpm/*.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # web source code
+        - "web/**"
 
   build-server:
     group: build
@@ -28,15 +27,14 @@ pipeline:
       - make release-server
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/binaries.yml"
-          - "nfpm/*.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
-          # web source code
-          - "web/**"
+        # related config files
+        - ".woodpecker/binaries.yml"
+        - "nfpm/*.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # web source code
+        - "web/**"
 
   build-agent:
     group: build
@@ -60,13 +58,12 @@ pipeline:
       - make release-cli
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/binaries.yml"
-          - "nfpm/*.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/binaries.yml"
+        - "nfpm/*.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
   build-deb-rpm:
     group: bundle
@@ -75,15 +72,14 @@ pipeline:
       - make bundle
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/binaries.yml"
-          - "nfpm/*.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
-          # web source code
-          - "web/**"
+        # related config files
+        - ".woodpecker/binaries.yml"
+        - "nfpm/*.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # web source code
+        - "web/**"
 
   checksums:
     image: golang:1.16
@@ -91,15 +87,14 @@ pipeline:
       - make release-checksums
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/binaries.yml"
-          - "nfpm/*.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
-          # web source code
-          - "web/**"
+        # related config files
+        - ".woodpecker/binaries.yml"
+        - "nfpm/*.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # web source code
+        - "web/**"
 
   # TODO: upload build artifacts for pushes to ${CI_REPO_DEFAULT_BRANCH}
 
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 7cd8e444a..f52bb3902 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -6,12 +6,13 @@ pipeline:
       - echo "test" > web/dist/index.html
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # schema changes
+        - "pipeline/schema/**"
 
   lint:
     image: golang:1.16
@@ -20,13 +21,12 @@ pipeline:
       - make lint
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          - ".golangci.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        - ".golangci.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
   test:
     image: golang:1.16
@@ -38,12 +38,13 @@ pipeline:
       - make test-lib
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
+        # schema changes
+        - "pipeline/schema/**"
 
   sqlite:
     image: golang:1.16
@@ -54,12 +55,11 @@ pipeline:
       - make test-server-datastore
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
   postgres:
     image: golang:1.16
@@ -71,12 +71,11 @@ pipeline:
       - make test-server-datastore
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
   mysql:
     image: golang:1.16
@@ -88,12 +87,11 @@ pipeline:
       - make test-server-datastore
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
 services:
   service-postgres:
@@ -104,12 +102,11 @@ services:
       - POSTGRES_HOST_AUTH_METHOD=trust
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
 
   service-mysql:
     image: mysql:5.6.27
@@ -119,9 +116,8 @@ services:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
     when:
       path:
-        include:
-          # related config files
-          - ".woodpecker/test.yml"
-          # go source code
-          - "**/*.go"
-          - "go.*"
+        # related config files
+        - ".woodpecker/test.yml"
+        # go source code
+        - "**/*.go"
+        - "go.*"
diff --git a/pipeline/schema/.woodpecker/test-when.yml b/pipeline/schema/.woodpecker/test-when.yml
index e8a831f8c..9975e71e5 100644
--- a/pipeline/schema/.woodpecker/test-when.yml
+++ b/pipeline/schema/.woodpecker/test-when.yml
@@ -79,6 +79,15 @@ pipeline:
     when:
       path: "folder/**"
 
+  when-path-array:
+    image: alpine
+    commands:
+      - echo "test"
+    when:
+      path:
+        - "folder/**"
+        - "**/*.c"
+
   when-path-include-exclude:
     image: alpine
     commands:
diff --git a/pipeline/schema/schema.json b/pipeline/schema/schema.json
index b7a5cc56f..a30419e89 100644
--- a/pipeline/schema/schema.json
+++ b/pipeline/schema/schema.json
@@ -260,6 +260,12 @@
           "description": "Execute a step only on commit with certain files added/removed/modified. Read more: https://woodpecker-ci.org/docs/usage/pipeline-syntax#environment",
           "oneOf": [
             { "type": "string" },
+            {
+              "type" :"array",
+              "items": {
+                "type": "string"
+              }
+            },
             {
               "type": "object",
               "properties": {