diff --git a/stable/pipelines-v2/Chart.yaml b/stable/pipelines-v2/Chart.yaml
index 5241d95a4..84d418e16 100644
--- a/stable/pipelines-v2/Chart.yaml
+++ b/stable/pipelines-v2/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: ">=2.5.0"
-version: 0.12.5
+version: 0.12.6
 name: pipelines-v2
 description: Kubeflow pipelines framework for machine learning
 home: https://www.kubeflow.org/
diff --git a/stable/pipelines-v2/templates/metadata/envoy-configmap.yaml b/stable/pipelines-v2/templates/metadata/envoy-configmap.yaml
new file mode 100644
index 000000000..9e7d3893a
--- /dev/null
+++ b/stable/pipelines-v2/templates/metadata/envoy-configmap.yaml
@@ -0,0 +1,82 @@
+{{- if .Values.deployment.create }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: metadata-envoy-configmap
+  labels:
+    component: metadata-envoy
+{{ include "pipelines.commonLabels" . | indent 4 }}
+data:
+  envoy-config.yaml: |-
+    admin:
+      access_log:
+        name: admin_access
+        typed_config:
+          "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
+          path: /tmp/admin_access.log
+      address:
+        socket_address: { address: 0.0.0.0, port_value: 9901 }
+
+    static_resources:
+      listeners:
+        - name: listener_0
+          address:
+            socket_address: { address: 0.0.0.0, port_value: 9090 }
+          filter_chains:
+            - filters:
+                - name: envoy.filters.network.http_connection_manager
+                  typed_config:
+                    "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+                    codec_type: auto
+                    stat_prefix: ingress_http
+                    route_config:
+                      name: local_route
+                      virtual_hosts:
+                        - name: local_service
+                          domains: [ "*" ]
+                          routes:
+                            - match: { prefix: "/" }
+                              route:
+                                cluster: metadata-cluster
+                                max_stream_duration:
+                                  grpc_timeout_header_max: '0s'
+                              typed_per_filter_config:
+                                envoy.filter.http.cors:
+                                  "@type": type.googleapis.com/envoy.extensions.filters.http.cors.v3.CorsPolicy
+                                  allow_origin_string_match:
+                                    - safe_regex:
+                                        regex: ".*"
+                                  allow_methods: GET, PUT, DELETE, POST, OPTIONS
+                                  allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout
+                                  max_age: "1728000"
+                                  expose_headers: custom-header-1,grpc-status,grpc-message
+                    http_filters:
+                      - name: envoy.filters.http.grpc_web
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
+                      - name: envoy.filters.http.cors
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.filters.http.cors.v3.Cors
+                      - name: envoy.filters.http.router
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+      clusters:
+        - name: metadata-cluster
+          connect_timeout: 30.0s
+          type: logical_dns
+          typed_extension_protocol_options:
+            envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+              "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+              explicit_http_config:
+                http2_protocol_options: { }
+          lb_policy: round_robin
+          load_assignment:
+            cluster_name: metadata-grpc
+            endpoints:
+              - lb_endpoints:
+                  - endpoint:
+                      address:
+                        socket_address:
+                          address: metadata-grpc-service
+                          port_value: 8080
+{{- end }}
diff --git a/stable/pipelines-v2/templates/metadata/envoy-deployment.yaml b/stable/pipelines-v2/templates/metadata/envoy-deployment.yaml
index 88369b948..aa3a8359b 100644
--- a/stable/pipelines-v2/templates/metadata/envoy-deployment.yaml
+++ b/stable/pipelines-v2/templates/metadata/envoy-deployment.yaml
@@ -23,6 +23,7 @@ spec:
       - name: container
         image: {{ .Values.images.metadataEnvoy.repository }}:{{ .Values.images.metadataEnvoy.tag }}
         imagePullPolicy: {{ .Values.images.imagePullPolicy }}
+        args: ["/etc/envoy/envoy-config.yaml"]
         ports:
         - name: md-envoy
           containerPort: 9090
@@ -38,8 +39,15 @@ spec:
           capabilities:
             drop:
             - ALL
+        volumeMounts:
+        - name: envoy-config
+          mountPath: /etc/envoy
         resources:
 {{ toYaml .Values.resources.metadataEnvoy | indent 10 }}
+      volumes:
+      - name: envoy-config
+        configMap:
+          name: metadata-envoy-configmap
 {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
diff --git a/stable/pipelines-v2/templates/metadata/writer-deployment.yaml b/stable/pipelines-v2/templates/metadata/writer-deployment.yaml
index 66d88d586..a850e78ae 100644
--- a/stable/pipelines-v2/templates/metadata/writer-deployment.yaml
+++ b/stable/pipelines-v2/templates/metadata/writer-deployment.yaml
@@ -28,6 +28,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         resources:
 {{ toYaml .Values.resources.metadataWriter | indent 10 }}
       serviceAccountName: kubeflow-pipelines-metadata-writer