diff --git a/manifests/2.18.0/opensearch-2.18.0.yml b/manifests/2.18.0/opensearch-2.18.0.yml
index d47d8f32b8..67552a3988 100644
--- a/manifests/2.18.0/opensearch-2.18.0.yml
+++ b/manifests/2.18.0/opensearch-2.18.0.yml
@@ -10,7 +10,7 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: d27ee4eb710db4d5d0776065d79408d91fd4f315
+    ref: 99a9a81da366173b0c2b963b26ea92e15ef34547
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
     ref: e4531fe22dbbc82090acfac5c928c2f355873c73
@@ -25,7 +25,7 @@ components:
       - windows
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: c22e76be87f997b2e4511274c0079c5d0c61bf86
+    ref: 6a7c785b9fb82c50cb4057cec0e8844836ca91b0
     platforms:
       - linux
       - windows
@@ -70,7 +70,7 @@ components:
       - k-NN
   - name: notifications-core
     repository: https://github.com/opensearch-project/notifications.git
-    ref: a49dd36004c933e6fe53d28381172c9ed9b6e721
+    ref: d3df65c5a79d8bdc51ccc47bbd76edb5e6a651e2
     working_directory: notifications
     platforms:
       - linux
@@ -79,7 +79,7 @@ components:
       - common-utils
   - name: notifications
     repository: https://github.com/opensearch-project/notifications.git
-    ref: a49dd36004c933e6fe53d28381172c9ed9b6e721
+    ref: d3df65c5a79d8bdc51ccc47bbd76edb5e6a651e2
     working_directory: notifications
     platforms:
       - linux
@@ -162,7 +162,7 @@ components:
       - linux
   - name: custom-codecs
     repository: https://github.com/opensearch-project/custom-codecs.git
-    ref: 2afbadd80892927a2acccd40561e3a9745e86806
+    ref: 5140c47982066f12ee15da4a3bfd7e41ac57ab13
     platforms:
       - linux
       - windows
diff --git a/manifests/2.18.0/opensearch-dashboards-2.18.0.yml b/manifests/2.18.0/opensearch-dashboards-2.18.0.yml
index 26df864e18..06989a02cc 100644
--- a/manifests/2.18.0/opensearch-dashboards-2.18.0.yml
+++ b/manifests/2.18.0/opensearch-dashboards-2.18.0.yml
@@ -15,16 +15,16 @@ components:
     ref: '2.18'
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/dashboards-observability.git
-    ref: 815b864a155ec0be58b6ea217d98711942108dd5
+    ref: aa36965b33b682007cb5fe25ad73d3196ca0d69e
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reporting.git
-    ref: 680774d6dcbb3b45ad84b2d57f14a5115bd45a09
+    ref: ae7be9a0fb6045149689f6a99dc0c3536c5a61f3
   - name: ganttChartDashboards
     repository: https://github.com/opensearch-project/dashboards-visualizations.git
-    ref: 97539d2efa0f1935689bc41fc3b681ee9655601f
+    ref: f106a7920607003522124b905493b305bfc08d3f
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/dashboards-query-workbench.git
-    ref: 1b41f0be0a0cfec7fc7540ef618cb6d5b48f3b60
+    ref: 595fcd246609cd8a2ffb26f54e9d3e65167ea8f5
   - name: customImportMapDashboards
     repository: https://github.com/opensearch-project/dashboards-maps.git
     ref: 511840ae5ca900610d521aad311677445269055f