diff --git a/manifests/1.3.5/opensearch-1.3.5.yml b/manifests/1.3.5/opensearch-1.3.5.yml
index 241dde19b3..34fc4c90a8 100644
--- a/manifests/1.3.5/opensearch-1.3.5.yml
+++ b/manifests/1.3.5/opensearch-1.3.5.yml
@@ -10,43 +10,43 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: '1.3'
+    ref: tags/1.3.5
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: alerting
     repository: https://github.com/opensearch-project/alerting.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: alerting
   - name: ml-commons
     repository: https://github.com/opensearch-project/ml-commons.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: opensearch-ml-plugin
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -54,7 +54,7 @@ components:
       - linux
   - name: performance-analyzer
     repository: https://github.com/opensearch-project/performance-analyzer.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -63,45 +63,45 @@ components:
       - linux
   - name: asynchronous-search
     repository: https://github.com/opensearch-project/asynchronous-search.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: anomaly-detection
     repository: https://github.com/opensearch-project/anomaly-detection.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: index-management
     repository: https://github.com/opensearch-project/index-management.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: cross-cluster-replication
     repository: https://github.com/opensearch-project/cross-cluster-replication.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: dashboards-reports
     repository: https://github.com/opensearch-project/dashboards-reports.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     working_directory: reports-scheduler
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: opensearch-observability
     repository: https://github.com/opensearch-project/observability
-    ref: '1.3'
+    ref: tags/1.3.5.0
     working_directory: opensearch-observability
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: sql
     repository: https://github.com/opensearch-project/sql.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: plugin
diff --git a/manifests/1.3.5/opensearch-dashboards-1.3.5.yml b/manifests/1.3.5/opensearch-dashboards-1.3.5.yml
index 30efa7c8c3..6fce8e8d06 100644
--- a/manifests/1.3.5/opensearch-dashboards-1.3.5.yml
+++ b/manifests/1.3.5/opensearch-dashboards-1.3.5.yml
@@ -9,35 +9,35 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: '1.3'
+    ref: tags/1.3.5
   - name: functionalTestDashboards
     repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
-    ref: '1.3'
+    ref: tags/1.3.5
   - name: securityDashboards
     repository: https://github.com/opensearch-project/security-dashboards-plugin.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: anomalyDetectionDashboards
     repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: indexManagementDashboards
     repository: https://github.com/opensearch-project/index-management-dashboards-plugin
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/sql.git
     working_directory: workbench
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reports.git
     working_directory: dashboards-reports
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: ganttChartDashboards
     repository: https://github.com/opensearch-project/dashboards-visualizations.git
     working_directory: gantt-chart
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/observability.git
     working_directory: dashboards-observability
-    ref: '1.3'
+    ref: tags/1.3.5.0
   - name: alertingDashboards
     repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
-    ref: '1.3'
+    ref: tags/1.3.5.0
diff --git a/manifests/2.2.1/opensearch-2.2.1.yml b/manifests/2.2.1/opensearch-2.2.1.yml
index 62cd963b46..be288b6222 100644
--- a/manifests/2.2.1/opensearch-2.2.1.yml
+++ b/manifests/2.2.1/opensearch-2.2.1.yml
@@ -10,13 +10,13 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: '2.2'
+    ref: tags/2.2.1
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -24,7 +24,7 @@ components:
       - gradle:properties:version
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -32,7 +32,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: ml-commons
     repository: https://github.com/opensearch-project/ml-commons.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -40,7 +40,7 @@ components:
       - gradle:dependencies:opensearch.version: opensearch-ml-plugin
   - name: performance-analyzer
     repository: https://github.com/opensearch-project/performance-analyzer.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -48,12 +48,12 @@ components:
       - gradle:dependencies:opensearch.version
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
   - name: geospatial
     repository: https://github.com/opensearch-project/geospatial.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -61,7 +61,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -69,7 +69,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: cross-cluster-replication
     repository: https://github.com/opensearch-project/cross-cluster-replication.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -77,7 +77,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: notifications-core
     repository: https://github.com/opensearch-project/notifications.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     working_directory: notifications
@@ -86,7 +86,7 @@ components:
       - gradle:dependencies:opensearch.version: opensearch-notifications-core
   - name: notifications
     repository: https://github.com/opensearch-project/notifications.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     working_directory: notifications
@@ -95,7 +95,7 @@ components:
       - gradle:dependencies:opensearch.version: notifications
   - name: anomaly-detection
     repository: https://github.com/opensearch-project/anomaly-detection.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -103,7 +103,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: asynchronous-search
     repository: https://github.com/opensearch-project/asynchronous-search.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -111,7 +111,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: alerting
     repository: https://github.com/opensearch-project/alerting.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -119,14 +119,14 @@ components:
       - gradle:dependencies:opensearch.version: alerting
   - name: index-management
     repository: https://github.com/opensearch-project/index-management.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
       - gradle:properties:version
   - name: sql
     repository: https://github.com/opensearch-project/sql.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     checks:
@@ -134,7 +134,7 @@ components:
       - gradle:dependencies:opensearch.version: opensearch-sql-plugin
   - name: opensearch-observability
     repository: https://github.com/opensearch-project/observability
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     working_directory: opensearch-observability
@@ -143,7 +143,7 @@ components:
       - gradle:dependencies:opensearch.version
   - name: dashboards-reports
     repository: https://github.com/opensearch-project/dashboards-reports.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
     platforms:
       - linux
     working_directory: reports-scheduler
diff --git a/manifests/2.2.1/opensearch-dashboards-2.2.1.yml b/manifests/2.2.1/opensearch-dashboards-2.2.1.yml
index 24cbf6be29..6e0c8f882a 100644
--- a/manifests/2.2.1/opensearch-dashboards-2.2.1.yml
+++ b/manifests/2.2.1/opensearch-dashboards-2.2.1.yml
@@ -9,43 +9,43 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: '2.2'
+    ref: tags/2.2.1
   - name: functionalTestDashboards
     repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
-    ref: '2.2'
+    ref: tags/2.2.1
   - name: securityDashboards
     repository: https://github.com/opensearch-project/security-dashboards-plugin.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: customImportMapDashboards
     repository: https://github.com/opensearch-project/dashboards-maps.git
     working_directory: src/plugins/custom_import_map
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: notificationsDashboards
     repository: https://github.com/opensearch-project/notifications.git
     working_directory: dashboards-notifications
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: anomalyDetectionDashboards
     repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: alertingDashboards
     repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: indexManagementDashboards
     repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/sql.git
     working_directory: workbench
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/observability.git
     working_directory: dashboards-observability
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: ganttChartDashboards
     repository: https://github.com/opensearch-project/dashboards-visualizations.git
     working_directory: gantt-chart
-    ref: '2.2'
+    ref: tags/2.2.1.0
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reports.git
     working_directory: dashboards-reports
-    ref: '2.2'
+    ref: tags/2.2.1.0