diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml
index 2f77ada374..33933d3bd3 100644
--- a/.github/workflows/os-increment-plugin-versions.yml
+++ b/.github/workflows/os-increment-plugin-versions.yml
@@ -55,6 +55,7 @@ jobs:
           - '1.3'
           - 2.x
           - main
+          - '2.17'
           - '2.18'
           - '2.19'
         exclude:
diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml
index c869225952..c48fc17ffe 100644
--- a/.github/workflows/osd-increment-plugin-versions.yml
+++ b/.github/workflows/osd-increment-plugin-versions.yml
@@ -46,6 +46,7 @@ jobs:
           - '1.3'
           - 2.x
           - main
+          - '2.17'
           - '2.18'
           - '2.19'
     steps:
diff --git a/legacy-manifests/1.3.18/opensearch-1.3.18-test.yml b/manifests/1.3.18/opensearch-1.3.18-test.yml
similarity index 100%
rename from legacy-manifests/1.3.18/opensearch-1.3.18-test.yml
rename to manifests/1.3.18/opensearch-1.3.18-test.yml
diff --git a/legacy-manifests/1.3.18/opensearch-1.3.18.yml b/manifests/1.3.18/opensearch-1.3.18.yml
similarity index 100%
rename from legacy-manifests/1.3.18/opensearch-1.3.18.yml
rename to manifests/1.3.18/opensearch-1.3.18.yml
diff --git a/legacy-manifests/1.3.18/opensearch-dashboards-1.3.18-test.yml b/manifests/1.3.18/opensearch-dashboards-1.3.18-test.yml
similarity index 100%
rename from legacy-manifests/1.3.18/opensearch-dashboards-1.3.18-test.yml
rename to manifests/1.3.18/opensearch-dashboards-1.3.18-test.yml
diff --git a/legacy-manifests/1.3.18/opensearch-dashboards-1.3.18.yml b/manifests/1.3.18/opensearch-dashboards-1.3.18.yml
similarity index 100%
rename from legacy-manifests/1.3.18/opensearch-dashboards-1.3.18.yml
rename to manifests/1.3.18/opensearch-dashboards-1.3.18.yml
diff --git a/legacy-manifests/2.17.0/opensearch-2.17.0-test.yml b/manifests/2.17.0/opensearch-2.17.0-test.yml
similarity index 100%
rename from legacy-manifests/2.17.0/opensearch-2.17.0-test.yml
rename to manifests/2.17.0/opensearch-2.17.0-test.yml
diff --git a/legacy-manifests/2.17.0/opensearch-2.17.0.yml b/manifests/2.17.0/opensearch-2.17.0.yml
similarity index 100%
rename from legacy-manifests/2.17.0/opensearch-2.17.0.yml
rename to manifests/2.17.0/opensearch-2.17.0.yml
diff --git a/legacy-manifests/2.17.0/opensearch-dashboards-2.17.0-test.yml b/manifests/2.17.0/opensearch-dashboards-2.17.0-test.yml
similarity index 100%
rename from legacy-manifests/2.17.0/opensearch-dashboards-2.17.0-test.yml
rename to manifests/2.17.0/opensearch-dashboards-2.17.0-test.yml
diff --git a/legacy-manifests/2.17.0/opensearch-dashboards-2.17.0.yml b/manifests/2.17.0/opensearch-dashboards-2.17.0.yml
similarity index 100%
rename from legacy-manifests/2.17.0/opensearch-dashboards-2.17.0.yml
rename to manifests/2.17.0/opensearch-dashboards-2.17.0.yml
diff --git a/legacy-manifests/2.17.1/opensearch-2.17.1-test.yml b/manifests/2.17.1/opensearch-2.17.1-test.yml
similarity index 100%
rename from legacy-manifests/2.17.1/opensearch-2.17.1-test.yml
rename to manifests/2.17.1/opensearch-2.17.1-test.yml
diff --git a/legacy-manifests/2.17.1/opensearch-2.17.1.yml b/manifests/2.17.1/opensearch-2.17.1.yml
similarity index 100%
rename from legacy-manifests/2.17.1/opensearch-2.17.1.yml
rename to manifests/2.17.1/opensearch-2.17.1.yml
diff --git a/legacy-manifests/2.17.1/opensearch-dashboards-2.17.1-test.yml b/manifests/2.17.1/opensearch-dashboards-2.17.1-test.yml
similarity index 100%
rename from legacy-manifests/2.17.1/opensearch-dashboards-2.17.1-test.yml
rename to manifests/2.17.1/opensearch-dashboards-2.17.1-test.yml
diff --git a/legacy-manifests/2.17.1/opensearch-dashboards-2.17.1.yml b/manifests/2.17.1/opensearch-dashboards-2.17.1.yml
similarity index 100%
rename from legacy-manifests/2.17.1/opensearch-dashboards-2.17.1.yml
rename to manifests/2.17.1/opensearch-dashboards-2.17.1.yml
diff --git a/legacy-manifests/2.17.2/opensearch-2.17.2-test.yml b/manifests/2.17.2/opensearch-2.17.2-test.yml
similarity index 100%
rename from legacy-manifests/2.17.2/opensearch-2.17.2-test.yml
rename to manifests/2.17.2/opensearch-2.17.2-test.yml
diff --git a/legacy-manifests/2.17.2/opensearch-2.17.2.yml b/manifests/2.17.2/opensearch-2.17.2.yml
similarity index 100%
rename from legacy-manifests/2.17.2/opensearch-2.17.2.yml
rename to manifests/2.17.2/opensearch-2.17.2.yml