diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
index c3f67eaf5..717750b45 100644
--- a/catalog/kubedb/active_versions.json
+++ b/catalog/kubedb/active_versions.json
@@ -8,6 +8,7 @@
     "25.0.0"
   ],
   "Elasticsearch": [
+    "xpack-8.15.0",
     "xpack-8.14.1",
     "xpack-8.13.4",
     "xpack-8.11.1",
@@ -21,6 +22,7 @@
     "xpack-7.13.4",
     "searchguard-7.9.3",
     "xpack-6.8.23",
+    "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
@@ -175,6 +177,7 @@
     "8.1.32"
   ],
   "Solr": [
+    "9.6.1",
     "9.4.1",
     "8.11.2"
   ],
diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
index beb1f11ae..b4bb51beb 100644
--- a/catalog/kubedb/backup_tasks.json
+++ b/catalog/kubedb/backup_tasks.json
@@ -5,6 +5,7 @@
   "elasticsearch-backup-7.14.0": [
     "xpack-7.17.15",
     "xpack-7.16.3",
+    "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
@@ -20,6 +21,7 @@
     "searchguard-7.9.3"
   ],
   "elasticsearch-backup-8.2.0": [
+    "xpack-8.15.0",
     "xpack-8.14.1",
     "xpack-8.13.4",
     "xpack-8.11.1",
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.16.0-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.16.0-opensearch.yaml
new file mode 100644
index 000000000..a6581f943
--- /dev/null
+++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.16.0-opensearch.yaml
@@ -0,0 +1,36 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: opensearch-2.16.0
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: ghcr.io/appscode-images/opensearch-dashboards:2.16.0
+  dashboardInitContainer:
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:2.16.0-opensearch-v2024.08.21
+  db:
+    image: ghcr.io/appscode-images/opensearch:2.16.0
+  distribution: OpenSearch
+  exporter:
+    image: prometheuscommunity/elasticsearch-exporter:v1.7.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: ghcr.io/kubedb/elasticsearch-init:2.16.0-opensearch-v2024.08.21
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+  version: 2.16.0
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml
new file mode 100644
index 000000000..e4464acfc
--- /dev/null
+++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml
@@ -0,0 +1,36 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: xpack-8.15.0
+spec:
+  authPlugin: X-Pack
+  dashboard:
+    image: ghcr.io/appscode-images/kibana:8.15.0
+  dashboardInitContainer:
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:8.15.0-xpack-v2024.08.21
+  db:
+    image: ghcr.io/appscode-images/elastic:8.15.0
+  distribution: ElasticStack
+  exporter:
+    image: prometheuscommunity/elasticsearch-exporter:v1.7.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: ghcr.io/kubedb/elasticsearch-init:8.15.0-xpack-v2024.08.21
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+  version: 8.15.0
diff --git a/catalog/kubedb/raw/solr/solr-9.6.1.yaml b/catalog/kubedb/raw/solr/solr-9.6.1.yaml
new file mode 100644
index 000000000..7ae4e64bb
--- /dev/null
+++ b/catalog/kubedb/raw/solr/solr-9.6.1.yaml
@@ -0,0 +1,12 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: SolrVersion
+metadata:
+  name: 9.6.1
+spec:
+  db:
+    image: ghcr.io/appscode-images/solr:9.6.1
+  initContainer:
+    image: ghcr.io/kubedb/solr-init:9.6.1
+  securityContext:
+    runAsUser: 8983
+  version: 9.6.1
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
index c65502e0d..12b3d7d5d 100644
--- a/catalog/kubedb/restore_tasks.json
+++ b/catalog/kubedb/restore_tasks.json
@@ -5,6 +5,7 @@
   "elasticsearch-restore-7.14.0": [
     "xpack-7.17.15",
     "xpack-7.16.3",
+    "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
@@ -20,6 +21,7 @@
     "searchguard-7.9.3"
   ],
   "elasticsearch-restore-8.2.0": [
+    "xpack-8.15.0",
     "xpack-8.14.1",
     "xpack-8.13.4",
     "xpack-8.11.1",
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml
new file mode 100644
index 000000000..efd020347
--- /dev/null
+++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml
@@ -0,0 +1,46 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Elasticsearch }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'opensearch-2.16.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:2.16.0'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.16.0-opensearch-v2024.08.21'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:2.16.0'
+  distribution: OpenSearch
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.0'
+  initContainer:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.4'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:2.16.0-opensearch-v2024.08.21'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+  version: 2.16.0
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml
new file mode 100644
index 000000000..0c5771924
--- /dev/null
+++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml
@@ -0,0 +1,46 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Elasticsearch }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'xpack-8.15.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: X-Pack
+  dashboard:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kibana") $) }}:8.15.0'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:8.15.0-xpack-v2024.08.21'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/elastic") $) }}:8.15.0'
+  distribution: ElasticStack
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.0'
+  initContainer:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.4'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:8.15.0-xpack-v2024.08.21'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+  version: 8.15.0
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml b/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml
new file mode 100644
index 000000000..80c766bd8
--- /dev/null
+++ b/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml
@@ -0,0 +1,22 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Solr }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: SolrVersion
+metadata:
+  name: '9.6.1'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/solr") $) }}:9.6.1'
+  initContainer:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/solr-init") $) }}:9.6.1'
+  securityContext:
+    runAsUser: 8983
+  version: 9.6.1
+{{ end }}