diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl
index c97d89f4cf..650a53db03 100644
--- a/charts/flyte-binary/templates/_helpers.tpl
+++ b/charts/flyte-binary/templates/_helpers.tpl
@@ -61,17 +61,6 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{/*
-Renders a value that contains template.
-*/}}
-{{- define "flyte-binary.renderTemplate" -}}
-{{- if typeIs "string" .value }}
-    {{- tpl .value .context }}
-{{- else }}
-    {{- tpl (.value | toYaml) .context }}
-{{- end }}
-{{- end -}}
-
 {{/*
 Get the Flyte configuration ConfigMap name.
 */}}
diff --git a/charts/flyte-binary/templates/admin-auth-secret.yaml b/charts/flyte-binary/templates/admin-auth-secret.yaml
index 55cdeb4564..3e164c1f10 100644
--- a/charts/flyte-binary/templates/admin-auth-secret.yaml
+++ b/charts/flyte-binary/templates/admin-auth-secret.yaml
@@ -6,11 +6,11 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
 type: Opaque
 {{- end }}
diff --git a/charts/flyte-binary/templates/auth-client-secret.yaml b/charts/flyte-binary/templates/auth-client-secret.yaml
index d58fecc193..f373bde567 100644
--- a/charts/flyte-binary/templates/auth-client-secret.yaml
+++ b/charts/flyte-binary/templates/auth-client-secret.yaml
@@ -6,11 +6,11 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
 type: Opaque
 stringData:
diff --git a/charts/flyte-binary/templates/cluster-resource-templates.yaml b/charts/flyte-binary/templates/cluster-resource-templates.yaml
index f60e95a4e6..ba40b5ee8e 100644
--- a/charts/flyte-binary/templates/cluster-resource-templates.yaml
+++ b/charts/flyte-binary/templates/cluster-resource-templates.yaml
@@ -6,17 +6,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.clusterResourceTemplates.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.clusterResourceTemplates.labels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.clusterResourceTemplates.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.clusterResourceTemplates.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.clusterResourceTemplates.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.clusterResourceTemplates.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 data:
   {{- if .Values.clusterResourceTemplates.inline }}
diff --git a/charts/flyte-binary/templates/clusterrole.yaml b/charts/flyte-binary/templates/clusterrole.yaml
index c9a6642f5a..85f882ef5a 100644
--- a/charts/flyte-binary/templates/clusterrole.yaml
+++ b/charts/flyte-binary/templates/clusterrole.yaml
@@ -6,17 +6,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.rbac.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.rbac.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.rbac.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.rbac.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 rules:
 - apiGroups:
diff --git a/charts/flyte-binary/templates/clusterrolebinding.yaml b/charts/flyte-binary/templates/clusterrolebinding.yaml
index 089f597bdb..3c13b302ad 100644
--- a/charts/flyte-binary/templates/clusterrolebinding.yaml
+++ b/charts/flyte-binary/templates/clusterrolebinding.yaml
@@ -6,17 +6,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.rbac.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.rbac.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.rbac.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.rbac.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml
index 77af0868a9..ad42579ef6 100644
--- a/charts/flyte-binary/templates/configmap.yaml
+++ b/charts/flyte-binary/templates/configmap.yaml
@@ -6,17 +6,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.configuration.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.configuration.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.configuration.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.configuration.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.configuration.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.configuration.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 data:
   000-core.yaml: |
@@ -83,7 +83,7 @@ data:
         region: {{ required "Region required for S3 storage provider" .region }}
         disable-ssl: {{ .disableSSL }}
         {{- if .endpoint }}
-        endpoint: {{ include "flyte-binary.renderTemplate" ( dict "value" .endpoint "context" $ ) }}
+        endpoint: {{ tpl .endpoint $ }}
         {{- end }}
         {{- if eq "iam" .authType }}
         auth-type: "iam"
@@ -167,7 +167,7 @@ data:
             - all
       authorizedUris:
       {{- if .Values.ingress.host }}
-      - https://{{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }}
+      - https://{{ tpl .Values.ingress.host . }}
       {{- end }}
       - http://{{ include "flyte-binary.fullname" . }}:{{ include "flyte-binary.service.httpPort" . }}
       - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}:{{ include "flyte-binary.service.httpPort" . }}
@@ -186,7 +186,7 @@ data:
   {{- end }}
   {{- if .Values.configuration.inline }}
   010-inline-config.yaml: |
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.configuration.inline "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.configuration.inline | toYaml ) . | nindent 4 }}
   {{- else if .Values.configuration.sourcePath }}
   {{- (tpl (.Files.Glob .Values.configuration.sourcePath).AsConfig . ) | nindent 2 }}
   {{- end }}
diff --git a/charts/flyte-binary/templates/db-password-secret.yaml b/charts/flyte-binary/templates/db-password-secret.yaml
index 2bfde16dc6..856aa0b63d 100644
--- a/charts/flyte-binary/templates/db-password-secret.yaml
+++ b/charts/flyte-binary/templates/db-password-secret.yaml
@@ -6,11 +6,11 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
 type: Opaque
 stringData:
diff --git a/charts/flyte-binary/templates/deployment.yaml b/charts/flyte-binary/templates/deployment.yaml
index 3959c8511d..48fe0b9201 100644
--- a/charts/flyte-binary/templates/deployment.yaml
+++ b/charts/flyte-binary/templates/deployment.yaml
@@ -5,17 +5,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.deployment.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.deployment.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.deployment.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.deployment.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 spec:
   replicas: 1
@@ -27,10 +27,10 @@ spec:
     metadata:
       labels: {{- include "flyte-binary.selectorLabels" . | nindent 8 }}
         {{- if .Values.commonLabels }}
-        {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
+        {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
         {{- end }}
         {{- if .Values.deployment.podLabels }}
-        {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.podLabels "context" $) | nindent 8 }}
+        {{- tpl ( .Values.deployment.podLabels | toYaml ) . | nindent 4 }}
         {{- end }}
       annotations:
         {{- if not .Values.configuration.existingConfigmap }}
@@ -47,14 +47,14 @@ spec:
         checksum/auth-client-secret: {{ include (print $.Template.BasePath "/auth-client-secret.yaml") . | sha256sum }}
         {{- end }}
         {{- if .Values.commonAnnotations }}
-        {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
+        {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
         {{- end }}
         {{- if .Values.deployment.podAnnotations }}
-        {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.podAnnotations "context" $) | nindent 8 }}
+        {{- tpl ( .Values.deployment.podAnnotations | toYaml ) . | nindent 4 }}
         {{- end }}
     spec:
       {{- if .Values.deployment.extraPodSpec }}
-      {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraPodSpec "context" $) | nindent 6 }}
+      {{- tpl ( .Values.deployment.extraPodSpec | toYaml ) . | nindent 6 }}
       {{- end }}
       {{- if .Values.deployment.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.deployment.podSecurityContext "enabled" | toYaml | nindent 12 }}
@@ -70,14 +70,14 @@ spec:
           {{- end }}
           command:
             {{- if .Values.deployment.waitForDB.command }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.waitForDB.command "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.waitForDB.command | toYaml ) . | nindent 12 }}
             {{- else }}
             - sh
             - -ec
             {{- end }}
           args:
             {{- if .Values.deployment.waitForDB.args }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.waitForDB.args "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.waitForDB.args | toYaml ) . | nindent 12 }}
             {{- else }}
             {{- with .Values.configuration.database }}
             - |
@@ -103,14 +103,14 @@ spec:
           {{- end }}
           command:
             {{- if .Values.deployment.genAdminAuthSecret.command }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.genAdminAuthSecret.command "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.genAdminAuthSecret.command | toYaml ) . | nindent 12 }}
             {{- else }}
             - sh
             - -ec
             {{- end }}
           args:
             {{- if .Values.deployment.genAdminAuthSecret.args }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.genAdminAuthSecret.args "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.genAdminAuthSecret.args | toYaml ) . | nindent 12 }}
             {{- else }}
             - |
               flyteadmin --config=/etc/flyte/config.d/*.yaml \
@@ -133,7 +133,7 @@ spec:
           {{- end }}
         {{- end }}
         {{- if .Values.deployment.initContainers }}
-        {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.initContainers "context" $ ) | nindent 8 }}
+        {{- tpl ( .Values.deployment.initContainers | toYaml ) . | nindent 8 }}
         {{- end }}
       {{- end }}
       containers:
@@ -143,11 +143,11 @@ spec:
           imagePullPolicy: {{ .pullPolicy | quote }}
           {{- end }}
           {{- if .Values.deployment.command }}
-          command: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.command "context" $) | nindent 12 }}
+          command: {{- tpl ( .Values.deployment.command | toYaml ) . | nindent 12 }}
           {{- end }}
           args:
             {{- if .Values.deployment.args }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.args "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.args | toYaml ) . | nindent 12 }}
             {{- else }}
             - start
             - --config
@@ -163,7 +163,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             {{- if .Values.deployment.extraEnvVars }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraEnvVars "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.extraEnvVars | toYaml ) . | nindent 12 }}
             {{- end }}
           {{- if or .Values.deployment.extraEnvVarsConfigMap .Values.deployment.extraEnvVarsSecret }}
           envFrom:
@@ -184,11 +184,11 @@ spec:
             - name: webhook
               containerPort: 9443
           {{- if .Values.deployment.startupProbe }}
-          startupProbe: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.customStartupProbe "context" $) | nindent 12 }}
+          startupProbe: {{- tpl ( .Values.deployment.customStartupProbe | toYaml ) . | nindent 12 }}
           {{- end }}
           livenessProbe:
           {{- if .Values.deployment.livenessProbe }}
-          {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.livenessProbe "context" $) | nindent 12 }}
+          {{- tpl ( .Values.deployment.livenessProbe | toYaml ) . | nindent 12 }}
           {{- else }}
             httpGet:
               path: /healthcheck
@@ -196,7 +196,7 @@ spec:
           {{- end }}
           readinessProbe:
           {{- if .Values.deployment.readinessProbe }}
-          {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.readinessProbe "context" $) | nindent 12 }}
+          {{- tpl ( .Values.deployment.readinessProbe | toYaml ) . | nindent 12 }}
           {{- else }}
             httpGet:
               path: /healthcheck
@@ -206,7 +206,7 @@ spec:
           resources: {{- toYaml .Values.deployment.resources | nindent 12 }}
           {{- end }}
           {{- if .Values.deployment.lifecycleHooks }}
-          lifecycle: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.lifecycleHooks "context" $) | nindent 12 }}
+          lifecycle: {{- tpl ( .Values.deployment.lifecycleHooks | toYaml ) . | nindent 12 }}
           {{- end }}
           volumeMounts:
             {{- if .Values.configuration.auth.enabled }}
@@ -225,10 +225,10 @@ spec:
             - name: state
               mountPath: /var/run/flyte
             {{- if .Values.deployment.extraVolumeMounts }}
-            {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraVolumeMounts "context" $) | nindent 12 }}
+            {{- tpl ( .Values.deployment.extraVolumeMounts | toYaml ) . | nindent 12 }}
             {{- end }}
         {{- if .Values.deployment.sidecars }}
-        {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.sidecars "context" $ ) | nindent 8 }}
+        {{- tpl ( .Values.deployment.sidecars | toYaml ) . | nindent 8 }}
         {{- end }}
       volumes:
         {{- if .Values.configuration.auth.enabled }}
@@ -254,5 +254,5 @@ spec:
         - name: state
           emptyDir: {}
         {{- if .Values.deployment.extraVolumes }}
-        {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.extraVolumes "context" $ ) | nindent 8 }}
+        {{- tpl ( .Values.deployment.extraVolumes | toYaml ) . | nindent 8 }}
         {{- end }}
diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml
index 6ddcd97851..8cde3dab41 100644
--- a/charts/flyte-binary/templates/ingress/grpc.yaml
+++ b/charts/flyte-binary/templates/ingress/grpc.yaml
@@ -6,20 +6,20 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.commonAnnotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.grpcAnnotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.grpcAnnotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.grpcAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
 spec:
   rules:
@@ -96,6 +96,6 @@ spec:
         path: /grpc.health.v1.Health/*
         pathType: ImplementationSpecific
     {{- if .Values.ingress.host }}
-    host: {{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }}
+    host: {{ tpl .Values.ingress.host . | quote }}
     {{- end }}
 {{- end }}
diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml
index 875a4e25ac..696b10b206 100644
--- a/charts/flyte-binary/templates/ingress/http.yaml
+++ b/charts/flyte-binary/templates/ingress/http.yaml
@@ -6,20 +6,20 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.commonAnnotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.ingress.httpAnnotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.httpAnnotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.ingress.httpAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
 spec:
   rules:
@@ -159,6 +159,6 @@ spec:
         path: /oauth2/*
         pathType: ImplementationSpecific
     {{- if .Values.ingress.host }}
-    host: {{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }}
+    host: {{ tpl .Values.ingress.host . | quote }}
     {{- end }}
 {{- end }}
diff --git a/charts/flyte-binary/templates/service/main.yaml b/charts/flyte-binary/templates/service/main.yaml
index 8224c34d65..9c93ff38d5 100644
--- a/charts/flyte-binary/templates/service/main.yaml
+++ b/charts/flyte-binary/templates/service/main.yaml
@@ -5,17 +5,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.service.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.service.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.service.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 spec:
   type: {{ .Values.service.type }}
@@ -49,6 +49,6 @@ spec:
       nodePort: null
       {{- end }}
     {{- if .Values.service.extraPorts }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
+    {{- tpl ( .Values.service.extraPorts | toYaml ) . | nindent 4 }}
     {{- end }}
   selector: {{- include "flyte-binary.selectorLabels" . | nindent 4 }}
diff --git a/charts/flyte-binary/templates/service/webhook.yaml b/charts/flyte-binary/templates/service/webhook.yaml
index 9cdb819461..f5375b1f70 100644
--- a/charts/flyte-binary/templates/service/webhook.yaml
+++ b/charts/flyte-binary/templates/service/webhook.yaml
@@ -5,17 +5,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.service.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.service.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.service.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 spec:
   type: ClusterIP
diff --git a/charts/flyte-binary/templates/serviceaccount.yaml b/charts/flyte-binary/templates/serviceaccount.yaml
index f22399d77f..a32b268361 100644
--- a/charts/flyte-binary/templates/serviceaccount.yaml
+++ b/charts/flyte-binary/templates/serviceaccount.yaml
@@ -6,16 +6,16 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "flyte-binary.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.serviceAccount.labels }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.serviceAccount.labels "context" $) | nindent 4 }}
+    {{- tpl ( .Values.serviceAccount.labels | toYaml ) . | nindent 4 }}
     {{- end }}
   annotations:
     {{- if .Values.commonAnnotations }}
-    {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }}
     {{- end }}
     {{- if .Values.serviceAccount.annotations }}
-    {{- include "flyte-binary.renderTemplate" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }}
+    {{- tpl ( .Values.serviceAccount.annotations | toYaml ) . | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/charts/flyte-sandbox/Chart.lock b/charts/flyte-sandbox/Chart.lock
index 9b192cad1d..e29ae65037 100644
--- a/charts/flyte-sandbox/Chart.lock
+++ b/charts/flyte-sandbox/Chart.lock
@@ -15,4 +15,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 12.1.0
 digest: sha256:ce2d6bd1488364f3ca98cc306554e479f1190ac828925af78a468a52f752449c
-generated: "2022-12-14T20:07:29.49547-08:00"
+generated: "2022-12-15T00:28:40.428989-08:00"
diff --git a/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz b/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz
index 9e4bbebd6e..e96900e1fe 100644
Binary files a/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz and b/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz differ
diff --git a/docker/sandbox-bundled/manifests/compiled.yaml b/docker/sandbox-bundled/manifests/compiled.yaml
index 842449edad..555ba8e9d2 100644
--- a/docker/sandbox-bundled/manifests/compiled.yaml
+++ b/docker/sandbox-bundled/manifests/compiled.yaml
@@ -698,7 +698,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: ZzBxYVNHclBTTWtBWnFHNw==
+  haSharedSecret: bnhMczc1Y2pCNUVXQWtTaw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1000,7 +1000,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 044987b193c168f87ad6b75510b710dae15de36461cb822559e13e6f3bf1789a
-        checksum/secret: 72a6bbe72d54584038d8aa7f79754ee807898053f9564c2beeede9fab93b7c25
+        checksum/secret: 933d36dc296a7cfb39a5de69e064f95d589c0a35426c30066495db78ccbfec7c
       labels:
         app: docker-registry
         release: sandbox