diff --git a/charts/horizon/Chart.yaml b/charts/horizon/Chart.yaml
index 2f8d3ad..adbe6bb 100644
--- a/charts/horizon/Chart.yaml
+++ b/charts/horizon/Chart.yaml
@@ -4,7 +4,7 @@ description: A CICD DevOps Platform
 
 type: application
 
-version: 2.2.9
+version: 2.2.10
 appVersion: v2.5.0
 dependencies:
   - name: common
diff --git a/charts/tektoncd/Chart.yaml b/charts/tektoncd/Chart.yaml
index 80234a0..38cb795 100644
--- a/charts/tektoncd/Chart.yaml
+++ b/charts/tektoncd/Chart.yaml
@@ -3,7 +3,7 @@ name: tektoncd
 
 type: application
 
-version: 2.1.2
+version: 2.1.3
 
 appVersion: 0.28.0
 
diff --git a/charts/tektoncd/templates/tekton-pipelines/release.yaml b/charts/tektoncd/templates/tekton-pipelines/release.yaml
index b0d8667..76f0984 100644
--- a/charts/tektoncd/templates/tekton-pipelines/release.yaml
+++ b/charts/tektoncd/templates/tekton-pipelines/release.yaml
@@ -818,7 +818,7 @@ data:
   enable-api-fields: "stable"
   # Setting this flag to "true" scopes when expressions to guard a Task only
   # instead of a Task and its dependent Tasks.
-  scope-when-expressions-to-task: "false"
+  scope-when-expressions-to-task: "{{ .Values.featureFlags.scopeWhenExpressionsToTask }}"
 
 ---
 # Copyright 2021 The Tekton Authors
@@ -1105,11 +1105,17 @@ spec:
             "-shell-image", "{{ .Values.tektonPipelineController.shellImage }}",
             # for script mode to work with windows we need a powershell image
             # pinning to nanoserver tag as of July 15 2021
-            "-shell-image-win", "{{ .Values.tektonPipelineController.shellImageWin }}",
+            "-shell-image-win", "{{ .Values.tektonPipelineController.shellImageWin }}"
             # Experimental. Uncomment below to disable TaskRun and PipelineRun
             # reconcilers' built-in taskRef and pipelineRef resolution procedures.
             # "-experimental-disable-in-tree-resolution",
+            {{- range .Values.tektonPipelineController.extraArgs }}
+            , {{ . | quote }}
+            {{- end }}
           ]
+          {{- with .Values.tektonPipelineController.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: config-logging
               mountPath: /etc/config-logging
diff --git a/charts/tektoncd/values.yaml b/charts/tektoncd/values.yaml
index bc3b19b..9e4184c 100644
--- a/charts/tektoncd/values.yaml
+++ b/charts/tektoncd/values.yaml
@@ -17,6 +17,8 @@ tektonPipelineController:
   gsutilImage: gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f
   shellImage: gcr.io/distroless/base:debug
   shellImageWin: mcr.microsoft.com/powershell:nanoserver@sha256:b6d5ff841b78bdf2dfed7550000fd4f3437385b8fa686ec0f010be24777654d6
+  extraArgs: []
+  resources: {}
 
 tektonPipelineWebhook:
   image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.28.0@sha256:f19dd16303ff8a8d55d706db5c8f8db593ba597684888bb15e70420fc4824103
@@ -83,3 +85,6 @@ configDefaults:
     # but that a TaskRun does not explicitly provide.
     # default-task-run-workspace-binding: |
     #   emptyDir: {}
+
+featureFlags:
+  scopeWhenExpressionsToTask: "true"