diff --git a/manifests/2.18.0/opensearch-2.18.0.yml b/manifests/2.18.0/opensearch-2.18.0.yml
index 51dec5d9c0..d4b9b5b31d 100644
--- a/manifests/2.18.0/opensearch-2.18.0.yml
+++ b/manifests/2.18.0/opensearch-2.18.0.yml
@@ -10,34 +10,34 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: '2.18'
+    ref: d27ee4eb710db4d5d0776065d79408d91fd4f315
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
-    ref: '2.18'
+    ref: e4531fe22dbbc82090acfac5c928c2f355873c73
     platforms:
       - linux
       - windows
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
-    ref: '2.18'
+    ref: 6143a42014e4731dc21df2b242d878af01bec3c2
     platforms:
       - linux
       - windows
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: '2.18'
+    ref: 000b08465f5e6581654151922bc3cedc1d7c48d4
     platforms:
       - linux
       - windows
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
-    ref: '2.18'
+    ref: 09c3754b3bdd4bece2f65f3d0c49d209c2b6676d
     platforms:
       - linux
       - windows
   - name: geospatial
     repository: https://github.com/opensearch-project/geospatial.git
-    ref: '2.18'
+    ref: 021d2d96fc686eeb3f1c9383b1515f1e58a655a1
     platforms:
       - linux
       - windows
@@ -45,7 +45,7 @@ components:
       - job-scheduler
   - name: cross-cluster-replication
     repository: https://github.com/opensearch-project/cross-cluster-replication.git
-    ref: '2.18'
+    ref: cdeea8182b56aaf7bce43359b2072e9edd9ac811
     platforms:
       - linux
       - windows
@@ -53,7 +53,7 @@ components:
       - common-utils
   - name: ml-commons
     repository: https://github.com/opensearch-project/ml-commons.git
-    ref: '2.18'
+    ref: 38945628b9dde357ee96781ad86fd06586523383
     platforms:
       - linux
       - windows
@@ -61,7 +61,7 @@ components:
       - common-utils
   - name: neural-search
     repository: https://github.com/opensearch-project/neural-search.git
-    ref: '2.18'
+    ref: d4d13c6bdc12a9fb7158698969d74ddee9a9917b
     platforms:
       - linux
       - windows
@@ -70,7 +70,7 @@ components:
       - k-NN
   - name: notifications-core
     repository: https://github.com/opensearch-project/notifications.git
-    ref: '2.18'
+    ref: a49dd36004c933e6fe53d28381172c9ed9b6e721
     working_directory: notifications
     platforms:
       - linux
@@ -79,7 +79,7 @@ components:
       - common-utils
   - name: notifications
     repository: https://github.com/opensearch-project/notifications.git
-    ref: '2.18'
+    ref: a49dd36004c933e6fe53d28381172c9ed9b6e721
     working_directory: notifications
     platforms:
       - linux
@@ -88,7 +88,7 @@ components:
       - common-utils
   - name: opensearch-observability
     repository: https://github.com/opensearch-project/observability.git
-    ref: '2.18'
+    ref: 326b984ec2bf56d2c0e4e9e871f3be6a43db49c5
     platforms:
       - linux
       - windows
@@ -96,7 +96,7 @@ components:
       - common-utils
   - name: opensearch-reports
     repository: https://github.com/opensearch-project/reporting.git
-    ref: '2.18'
+    ref: 7a271ff77810e3c08f2e9bc7f47eff845d4ea9b8
     platforms:
       - linux
       - windows
@@ -105,7 +105,7 @@ components:
       - job-scheduler
   - name: sql
     repository: https://github.com/opensearch-project/sql.git
-    ref: '2.18'
+    ref: 4b9602b639231f94bb6f04d13af94e56b03632c1
     platforms:
       - linux
       - windows
@@ -113,7 +113,7 @@ components:
       - ml-commons
   - name: asynchronous-search
     repository: https://github.com/opensearch-project/asynchronous-search.git
-    ref: '2.18'
+    ref: fd3fe2948d0be097a838894e7eef3ebbbb98e253
     platforms:
       - linux
       - windows
@@ -121,7 +121,7 @@ components:
       - common-utils
   - name: anomaly-detection
     repository: https://github.com/opensearch-project/anomaly-detection.git
-    ref: '2.18'
+    ref: 63996b8d781bf600da802c1d7d26d24001f3ea32
     platforms:
       - linux
       - windows
@@ -130,7 +130,7 @@ components:
       - job-scheduler
   - name: alerting
     repository: https://github.com/opensearch-project/alerting.git
-    ref: '2.18'
+    ref: d4d463c17f1927e8adc6ebf49f5d7ca4f2f1f5f5
     platforms:
       - linux
       - windows
@@ -138,7 +138,7 @@ components:
       - common-utils
   - name: security-analytics
     repository: https://github.com/opensearch-project/security-analytics.git
-    ref: '2.18'
+    ref: a1f7ec31022319b361a5fb1dd7337a0b214a6d40
     platforms:
       - linux
       - windows
@@ -148,7 +148,7 @@ components:
       - job-scheduler
   - name: index-management
     repository: https://github.com/opensearch-project/index-management.git
-    ref: '2.18'
+    ref: abb16798959ee7a99a94e03f60859b2516c78f07
     platforms:
       - linux
       - windows
@@ -157,18 +157,18 @@ components:
       - job-scheduler
   - name: performance-analyzer
     repository: https://github.com/opensearch-project/performance-analyzer.git
-    ref: '2.18'
+    ref: bd6833f48048c559b431d392b4ad20cdaeb24071
     platforms:
       - linux
   - name: custom-codecs
     repository: https://github.com/opensearch-project/custom-codecs.git
-    ref: '2.18'
+    ref: 2afbadd80892927a2acccd40561e3a9745e86806
     platforms:
       - linux
       - windows
   - name: flow-framework
     repository: https://github.com/opensearch-project/flow-framework.git
-    ref: '2.18'
+    ref: 2de661a9f7f2e984dd43b8d1356dbd0e33419648
     platforms:
       - linux
       - windows
@@ -176,7 +176,7 @@ components:
       - common-utils
   - name: skills
     repository: https://github.com/opensearch-project/skills.git
-    ref: '2.18'
+    ref: 2aa25d10580e08a803303d9f0d83818fed479272
     platforms:
       - linux
       - windows
@@ -187,13 +187,13 @@ components:
       - ml-commons
   - name: query-insights
     repository: https://github.com/opensearch-project/query-insights.git
-    ref: '2.18'
+    ref: 4ea8fe0b10a06960494a730ab62bfdf40176c908
     platforms:
       - linux
       - windows
   - name: opensearch-system-templates
     repository: https://github.com/opensearch-project/opensearch-system-templates.git
-    ref: '2.18'
+    ref: 84c79dea205af1c8c0101d1cdacc5e8ae98358e0
     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 60274f210b..fb3b0053cc 100644
--- a/manifests/2.18.0/opensearch-dashboards-2.18.0.yml
+++ b/manifests/2.18.0/opensearch-dashboards-2.18.0.yml
@@ -9,52 +9,52 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: '2.18'
+    ref: 50a714fde5fa89077a759da9b61d8fa4d32db033
   - name: functionalTestDashboards
     repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
     ref: '2.18'
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/dashboards-observability.git
-    ref: '2.18'
+    ref: 815b864a155ec0be58b6ea217d98711942108dd5
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reporting.git
-    ref: '2.18'
+    ref: d3d0a0e35f05c04a54ee0b1858ec167520a5efdb
   - name: ganttChartDashboards
     repository: https://github.com/opensearch-project/dashboards-visualizations.git
-    ref: '2.18'
+    ref: 97539d2efa0f1935689bc41fc3b681ee9655601f
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/dashboards-query-workbench.git
-    ref: '2.18'
+    ref: 1b41f0be0a0cfec7fc7540ef618cb6d5b48f3b60
   - name: customImportMapDashboards
     repository: https://github.com/opensearch-project/dashboards-maps.git
-    ref: '2.18'
+    ref: 511840ae5ca900610d521aad311677445269055f
   - name: anomalyDetectionDashboards
     repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin.git
-    ref: '2.18'
+    ref: 1a9003213748bdd2e01bd13851900249942a7d0f
   - name: mlCommonsDashboards
     repository: https://github.com/opensearch-project/ml-commons-dashboards.git
-    ref: '2.18'
+    ref: 5e9facb669f74f5aa0585dae5670276c1f65494e
   - name: indexManagementDashboards
     repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
-    ref: '2.18'
+    ref: a9c12e8403a16c22f11218cf89d5aec9825beca8
   - name: notificationsDashboards
     repository: https://github.com/opensearch-project/dashboards-notifications.git
-    ref: '2.18'
+    ref: f85c1bcf51a7b26a73cb24a340d25126fae9ff4e
   - name: alertingDashboards
     repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
-    ref: '2.18'
+    ref: 4dfa34f5e4e939d8acfa0f151d20e604c23fe05b
   - name: securityAnalyticsDashboards
     repository: https://github.com/opensearch-project/security-analytics-dashboards-plugin.git
-    ref: '2.18'
+    ref: 5aba4d3d2fd6b2b4b55696c72a090f937eabf5fe
   - name: securityDashboards
     repository: https://github.com/opensearch-project/security-dashboards-plugin.git
-    ref: '2.18'
+    ref: 9d0c35cdf1add29c28bd0a2207c25e02aa935929
   - name: searchRelevanceDashboards
     repository: https://github.com/opensearch-project/dashboards-search-relevance.git
-    ref: '2.18'
+    ref: 5662aa833c6452db970e8d5f036500385fb3892b
   - name: assistantDashboards
     repository: https://github.com/opensearch-project/dashboards-assistant.git
-    ref: '2.18'
+    ref: 98fa5324900ffa365a24b027cf17f1f87c1beae4
   - name: flowFrameworkDashboards
     repository: https://github.com/opensearch-project/dashboards-flow-framework.git
-    ref: '2.18'
+    ref: c037914ffa2b0c4617f8e20df0c29f02c1aa3a8e