diff --git a/opensearch-jobs.yml b/opensearch-jobs.yml
index 45f8cc5..301402e 100644
--- a/opensearch-jobs.yml
+++ b/opensearch-jobs.yml
@@ -26,6 +26,8 @@ instance_groups:
           indices.query.bool.max_clause_count: 2048
         jvm_options:
           - "-Dlog4j2.formatMsgNoLookups=true"
+        cf:
+          client_id: opensearch_client_id
   persistent_disk_type: logs_opensearch_os_data
   stemcell: default
   azs: [z1]
diff --git a/opsfiles/cf-development.yml b/opsfiles/cf-development.yml
index 3b957cd..d67ff7a 100644
--- a/opsfiles/cf-development.yml
+++ b/opsfiles/cf-development.yml
@@ -13,3 +13,9 @@
   path: /instance_groups/name=maintenance/jobs/name=upload-dashboards-objects/properties?/cloudfoundry?/system_domain?
   value: ((cf-api-development))
 
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/client_password?
+  value: ((/bosh/cf-development/opensearch_client_secret))
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/domain?
+  value: ((cf-api-development))
diff --git a/opsfiles/cf-production.yml b/opsfiles/cf-production.yml
index a994ae9..8e6766c 100644
--- a/opsfiles/cf-production.yml
+++ b/opsfiles/cf-production.yml
@@ -11,4 +11,11 @@
   value: ((/bosh/cf-production/opensearch_client_secret))
 - type: replace
   path: /instance_groups/name=maintenance/jobs/name=upload-dashboards-objects/properties?/cloudfoundry?/system_domain?
-  value: ((cf-api-production))
\ No newline at end of file
+  value: ((cf-api-production))
+
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/client_password?
+  value: ((/bosh/cf-production/opensearch_client_secret))
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/domain?
+  value: ((cf-api-production))
diff --git a/opsfiles/cf-staging.yml b/opsfiles/cf-staging.yml
index 1ef8200..1e4a38f 100644
--- a/opsfiles/cf-staging.yml
+++ b/opsfiles/cf-staging.yml
@@ -11,4 +11,12 @@
   value: ((/bosh/cf-staging/opensearch_client_secret))
 - type: replace
   path: /instance_groups/name=maintenance/jobs/name=upload-dashboards-objects/properties?/cloudfoundry?/system_domain?
-  value: ((cf-api-staging))
\ No newline at end of file
+  value: ((cf-api-staging))
+
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/client_password?
+  value: ((/bosh/cf-staging/opensearch_client_secret))
+- type: replace
+  path: /instance_groups/name=opensearch_data/jobs/name=opensearch/properties?/opensearch?/cf?/domain?
+  value: ((cf-api-staging))
+