diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl
index c840c4d8..9c3d8a56 100644
--- a/charts/openmetadata/templates/_helpers.tpl
+++ b/charts/openmetadata/templates/_helpers.tpl
@@ -359,6 +359,7 @@ OpenMetadata Configurations Environment Variables*/}}
   value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.ingestionIpInfoEnabled }}"
 - name: PIPELINE_SERVICE_CLIENT_ENDPOINT
   value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.apiEndpoint }}"
+{{ if and (contains "airflow" .Values.openmetadata.config.pipelineServiceClientConfig.className) (.Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled) }}
 {{- with .Values.openmetadata.config.pipelineServiceClientConfig.auth }}
 - name: AIRFLOW_USERNAME
   value: "{{ .username }}"
@@ -368,6 +369,7 @@ OpenMetadata Configurations Environment Variables*/}}
       name: {{ .password.secretRef }}
       key: {{ .password.secretKey }}
 {{- end }}
+{{- end }}
 - name: PIPELINE_SERVICE_CLIENT_VERIFY_SSL
   value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.verifySsl }}"
 - name: PIPELINE_SERVICE_CLIENT_HOST_IP
diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json
index ffb84ac4..ad6f8fb6 100644
--- a/charts/openmetadata/values.schema.json
+++ b/charts/openmetadata/values.schema.json
@@ -164,7 +164,7 @@
                             "properties": {
                                 "auth": {
                                     "type": "object",
-                                    "additionalProperties": false,
+                                    "additionalProperties": true,
                                     "properties": {
                                         "password": {
                                             "type": "object",
@@ -1056,6 +1056,9 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
+                "enabled" : {
+                    "type": "boolean"
+                },
                 "config": {
                     "type": "object",
                     "properties": {
diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
index 7c791e14..1ebbddec 100644
--- a/charts/openmetadata/values.yaml
+++ b/charts/openmetadata/values.yaml
@@ -56,7 +56,7 @@ openmetadata:
       dbParams: "allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC"
     pipelineServiceClientConfig:
       enabled: true
-      className: "org.openmetadata.service.clients.pipeline.airflow.AirflowRESTClient"
+      className: "io.collate.pipeline.argo.ArgoServiceClient"
       # endpoint url for airflow
       apiEndpoint: http://openmetadata-dependencies-web:8080
       # this will be the api endpoint url of OpenMetadata Server
@@ -70,6 +70,7 @@ openmetadata:
       # local path in Airflow Pod
       sslCertificatePath: "/no/path"
       auth:
+        enabled: true
         username: admin
         password:
           secretRef: airflow-secrets
@@ -392,8 +393,8 @@ startupProbe:
 podDisruptionBudget:
   enabled: false
   config:
-    maxUnavailable: 1
-    minAvailable: 1
+    maxUnavailable: "1"
+    minAvailable: "1"
 
 commonLabels: {}
 podAnnotations: {}
\ No newline at end of file