diff --git a/config/eventing-istio.yaml b/config/eventing-istio.yaml
index 6c014079..29765084 100644
--- a/config/eventing-istio.yaml
+++ b/config/eventing-istio.yaml
@@ -4,22 +4,27 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.10:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles: {}
   e2e:
diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml
index e453b90b..5ae740d7 100644
--- a/config/eventing-kafka-broker.yaml
+++ b/config/eventing-kafka-broker.yaml
@@ -4,22 +4,27 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.10:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles: {}
   e2e:
diff --git a/config/eventing.yaml b/config/eventing.yaml
index 8568b266..12581104 100644
--- a/config/eventing.yaml
+++ b/config/eventing.yaml
@@ -8,18 +8,22 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles: {}
   e2e:
diff --git a/config/serving-net-istio.yaml b/config/serving-net-istio.yaml
index 744b322c..c8cc425c 100644
--- a/config/serving-net-istio.yaml
+++ b/config/serving-net-istio.yaml
@@ -4,18 +4,22 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles: {}
   ignoreConfigs: {}
diff --git a/config/serving-net-kourier.yaml b/config/serving-net-kourier.yaml
index 965d9068..f750b618 100644
--- a/config/serving-net-kourier.yaml
+++ b/config/serving-net-kourier.yaml
@@ -4,18 +4,22 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles: {}
   ignoreConfigs: {}
diff --git a/config/serving.yaml b/config/serving.yaml
index 89ccfd54..18d399f7 100644
--- a/config/serving.yaml
+++ b/config/serving.yaml
@@ -4,6 +4,7 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
       skipDockerFilesMatches:
       - openshift/ci-operator/knative-perf-images.*
       skipE2EMatches:
@@ -13,18 +14,22 @@ config:
       openShiftVersions:
       - version: "4.14"
       - version: "4.11"
+        onDemand: true
     release-v1.11:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.12:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
     release-v1.13:
       openShiftVersions:
       - version: "4.14"
       - version: "4.12"
+        onDemand: true
 repositories:
 - dockerfiles:
     matches: