diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh b/docs/modules/opensearch/examples/getting_started/getting_started.sh
index 8e8373c5..7ca6c16e 100755
--- a/docs/modules/opensearch/examples/getting_started/getting_started.sh
+++ b/docs/modules/opensearch/examples/getting_started/getting_started.sh
@@ -141,7 +141,7 @@ kubectl create secret generic opensearch-credentials \
 
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 # end::opensearch-dashboards[]
diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2 b/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
index c4804239..7e3b0e50 100755
--- a/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
@@ -141,7 +141,7 @@ kubectl create secret generic opensearch-credentials \
 
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 # end::opensearch-dashboards[]
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml
index fe1fff2d..8b4a322d 100644
--- a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml
+++ b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml
@@ -1,7 +1,7 @@
 ---
 image:
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable0.0.0-dev
+  tag: 3.6.0-stackable0.0.0-dev
 serviceAccount:
   create: false
   name: simple-opensearch-serviceaccount
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2 b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2
index f4067ca3..b1b20b5f 100644
--- a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2
+++ b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2
@@ -1,7 +1,7 @@
 ---
 image:
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable{{ versions.opensearch }}
+  tag: 3.6.0-stackable{{ versions.opensearch }}
 serviceAccount:
   create: false
   name: simple-opensearch-serviceaccount
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch.yaml b/docs/modules/opensearch/examples/getting_started/opensearch.yaml
index c1586c40..e564100f 100644
--- a/docs/modules/opensearch/examples/getting_started/opensearch.yaml
+++ b/docs/modules/opensearch/examples/getting_started/opensearch.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-opensearch
 spec:
   image:
-    productVersion: 3.4.0
+    productVersion: 3.6.0
   clusterConfig:
     security:
       settings:
diff --git a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc
index eb467eae..dad172cc 100644
--- a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc
+++ b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc
@@ -13,7 +13,7 @@ A basic `values.yaml` file to deploy OpenSearch Dashboards with this chart might
 opensearchHosts: null # <1>
 image: # <2>
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable0.0.0-dev
+  tag: 3.6.0-stackable0.0.0-dev
 serviceAccount:
   create: false
   name: opensearch-serviceaccount # <3>
@@ -92,7 +92,7 @@ After the values are adjusted according to your deployment, especially `opensear
 ----
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 ----
diff --git a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2 b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2
index 99e6d7f6..230f35ca 100644
--- a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2
+++ b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2
@@ -13,7 +13,7 @@ A basic `values.yaml` file to deploy OpenSearch Dashboards with this chart might
 opensearchHosts: null # <1>
 image: # <2>
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable{{ versions.opensearch }}
+  tag: 3.6.0-stackable{{ versions.opensearch }}
 serviceAccount:
   create: false
   name: opensearch-serviceaccount # <3>
@@ -92,7 +92,7 @@ After the values are adjusted according to your deployment, especially `opensear
 ----
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 ----
diff --git a/docs/modules/opensearch/pages/usage-guide/security.adoc b/docs/modules/opensearch/pages/usage-guide/security.adoc
index 0fa1007a..223eb616 100644
--- a/docs/modules/opensearch/pages/usage-guide/security.adoc
+++ b/docs/modules/opensearch/pages/usage-guide/security.adoc
@@ -163,7 +163,7 @@ metadata:
   name: opensearch
 spec:
   image:
-    productVersion: 3.4.0
+    productVersion: 3.6.0
   clusterConfig:
     tls:
       serverSecretClass: tls # <1>
diff --git a/docs/modules/opensearch/partials/supported-versions.adoc b/docs/modules/opensearch/partials/supported-versions.adoc
index 9912bbcf..19750b4f 100644
--- a/docs/modules/opensearch/partials/supported-versions.adoc
+++ b/docs/modules/opensearch/partials/supported-versions.adoc
@@ -3,4 +3,5 @@
 // Stackable Platform documentation.
 
 - 3.1.0 (LTS)
-- 3.4.0
+- 3.6.0
+- 3.4.0 (deprecated)
diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
index b6c65f87..f48e352a 100644
--- a/rust/operator-binary/src/controller.rs
+++ b/rust/operator-binary/src/controller.rs
@@ -602,14 +602,14 @@ mod tests {
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
-            ProductVersion::from_str_unsafe("3.4.0"),
+            ProductVersion::from_str_unsafe("3.6.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),
             uuid!("e6ac237d-a6d4-43a1-8135-f36506110912"),
diff --git a/rust/operator-binary/src/controller/build.rs b/rust/operator-binary/src/controller/build.rs
index 6f374bf0..732aa022 100644
--- a/rust/operator-binary/src/controller/build.rs
+++ b/rust/operator-binary/src/controller/build.rs
@@ -177,14 +177,14 @@ mod tests {
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
-            ProductVersion::from_str_unsafe("3.4.0"),
+            ProductVersion::from_str_unsafe("3.6.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),
             uuid!("e6ac237d-a6d4-43a1-8135-f36506110912"),
diff --git a/rust/operator-binary/src/controller/build/node_config.rs b/rust/operator-binary/src/controller/build/node_config.rs
index 8a6805dc..955f4edf 100644
--- a/rust/operator-binary/src/controller/build/node_config.rs
+++ b/rust/operator-binary/src/controller/build/node_config.rs
@@ -70,7 +70,7 @@ const CONFIG_OPTION_NODE_ROLES: &str = "node.roles";
 
 /// Defines the path for the logs
 /// OpenSearch grants the required access rights, see
-/// <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/bootstrap/Security.java#L369>
+/// <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/bootstrap/Security.java#L371>
 /// The permissions "write" and "delete" are required for the log file rollover.
 /// Type: string
 const CONFIG_OPTION_PATH_LOGS: &str = "path.logs";
@@ -371,7 +371,7 @@ impl NodeConfig {
     /// Please read the following sections for an explanation of these restrictions.
     ///
     /// This configuration setting replaces the setting `cluster.initial_master_nodes`, see
-    /// <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L79-L93>.
+    /// <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L79-L93>.
     ///
     /// This setting is required on nodes with the cluster-manager node role on a multi-node
     /// cluster. Otherwise the bootstrapping of the cluster fails and all pods report:
@@ -381,7 +381,7 @@ impl NodeConfig {
     /// error is thrown:
     ///  > setting [cluster.initial_cluster_manager_nodes] is not allowed when [discovery.type] is set to [single-node]
     ///
-    /// see <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L126-L136>
+    /// see <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L126-L136>
     ///
     /// This setting does not seem to have an effect on nodes without the cluster-manager node
     /// role. However, as it is recommended (see the Elasticsearch documentation below) to not set
@@ -534,7 +534,7 @@ mod tests {
     }
 
     fn node_config(test_config: TestConfig) -> NodeConfig {
-        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.4.0"}"#)
+        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.6.0"}"#)
             .expect("should be a valid ProductImage");
 
         let role_group_name = RoleGroupName::from_str_unsafe("data");
@@ -603,10 +603,10 @@ mod tests {
 
         let cluster = ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
diff --git a/rust/operator-binary/src/controller/build/product_logging/config.rs b/rust/operator-binary/src/controller/build/product_logging/config.rs
index edc3e964..5b6fde05 100644
--- a/rust/operator-binary/src/controller/build/product_logging/config.rs
+++ b/rust/operator-binary/src/controller/build/product_logging/config.rs
@@ -91,7 +91,7 @@ fn log4j2_console_appender_config(
             "PatternLayout".to_owned(),
         ),
         // Same as the default layout pattern of the console appender
-        // see https://github.com/opensearch-project/OpenSearch/blob/3.4.0/distribution/src/config/log4j2.properties#L17
+        // see https://github.com/opensearch-project/OpenSearch/blob/3.6.0/distribution/src/config/log4j2.properties#L17
         (
             "appender.CONSOLE.layout.pattern".to_owned(),
             "[%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n".to_owned(),
diff --git a/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml b/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml
index 9325f903..e8b70063 100644
--- a/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml
+++ b/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml
@@ -45,14 +45,14 @@ tests:
             {"type": "server", "timestamp": "2025-10-01T12:47:28,363Z", "level": "INFO", "component": "o.o.c.c.JoinHelper", "cluster.name": "opensearch", "node.name": "opensearch-nodes-cluster-manager-0", "message": "failed to join {opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true} with JoinRequest{sourceNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}, minimumTerm=0, optionalJoin=Optional[Join{term=1, lastAcceptedTerm=0, lastAcceptedVersion=0, sourceNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}, targetNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}}]}",
             "stacktrace": ["org.opensearch.transport.RemoteTransportException: [opensearch-nodes-cluster-manager-0][10.244.0.20:9300][internal:cluster/coordination/join]",
             "Caused by: org.opensearch.cluster.coordination.CoordinationStateRejectedException: became follower",
-            "at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]",
+            "at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]",
             "at java.base/java.util.HashMap$$Values.forEach(HashMap.java:1073) ~[?:?]",
-            "at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]",
-            "at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.4.0.jar:3.4.0]",
-            "at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.4.0.jar:3.4.0]",
-            "at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.4.0.jar:3.4.0]",
-            "at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.4.0.jar:3.4.0]",
-            "at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.4.0.jar:3.4.0]",
+            "at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]",
+            "at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.6.0.jar:3.6.0]",
+            "at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.6.0.jar:3.6.0]",
+            "at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.6.0.jar:3.6.0]",
+            "at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.6.0.jar:3.6.0]",
+            "at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.6.0.jar:3.6.0]",
             "at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) ~[?:?]",
             "at java.base/java.util.concurrent.ThreadPoolExecutor$$Worker.run(ThreadPoolExecutor.java:642) ~[?:?]",
             "at java.base/java.lang.Thread.run(Thread.java:1583) [?:?]"] }
@@ -75,14 +75,14 @@ tests:
                   \n\
                   org.opensearch.transport.RemoteTransportException: [opensearch-nodes-cluster-manager-0][10.244.0.20:9300][internal:cluster/coordination/join]\n\
                   Caused by: org.opensearch.cluster.coordination.CoordinationStateRejectedException: became follower\n\
-                  at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]\n\
+                  at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]\n\
                   at java.base/java.util.HashMap$$Values.forEach(HashMap.java:1073) ~[?:?]\n\
-                  at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]\n\
-                  at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.4.0.jar:3.4.0]\n\
-                  at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.4.0.jar:3.4.0]\n\
-                  at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.4.0.jar:3.4.0]\n\
-                  at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.4.0.jar:3.4.0]\n\
-                  at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.4.0.jar:3.4.0]\n\
+                  at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]\n\
+                  at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.6.0.jar:3.6.0]\n\
+                  at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.6.0.jar:3.6.0]\n\
+                  at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.6.0.jar:3.6.0]\n\
+                  at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.6.0.jar:3.6.0]\n\
+                  at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.6.0.jar:3.6.0]\n\
                   at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) ~[?:?]\n\
                   at java.base/java.util.concurrent.ThreadPoolExecutor$$Worker.run(ThreadPoolExecutor.java:642) ~[?:?]\n\
                   at java.base/java.lang.Thread.run(Thread.java:1583) [?:?]",
diff --git a/rust/operator-binary/src/controller/build/role_builder.rs b/rust/operator-binary/src/controller/build/role_builder.rs
index 95979e07..cc94fd5b 100644
--- a/rust/operator-binary/src/controller/build/role_builder.rs
+++ b/rust/operator-binary/src/controller/build/role_builder.rs
@@ -422,7 +422,7 @@ mod tests {
     }
 
     fn role_builder<'a>(context_names: &'a ContextNames) -> RoleBuilder<'a> {
-        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.4.0"}"#)
+        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.6.0"}"#)
             .expect("should be a valid ProductImage");
 
         let role_group_config = OpenSearchRoleGroupConfig {
@@ -458,10 +458,10 @@ mod tests {
 
         let cluster = ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
@@ -513,7 +513,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-serviceaccount",
@@ -551,7 +551,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-rolebinding",
@@ -602,7 +602,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-seed-nodes",
@@ -658,7 +658,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster",
@@ -710,7 +710,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster",
@@ -755,7 +755,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster-security-config",
diff --git a/rust/operator-binary/src/controller/build/role_group_builder.rs b/rust/operator-binary/src/controller/build/role_group_builder.rs
index 9273ecc4..668e30fc 100644
--- a/rust/operator-binary/src/controller/build/role_group_builder.rs
+++ b/rust/operator-binary/src/controller/build/role_group_builder.rs
@@ -1544,10 +1544,10 @@ mod tests {
 
     fn validated_cluster(security_mode: TestSecurityMode) -> ValidatedCluster {
         let image = ResolvedProductImage {
-            product_version: "3.4.0".to_owned(),
-            app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+            product_version: "3.6.0".to_owned(),
+            app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                 .expect("should be a valid label value"),
-            image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+            image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
             image_pull_policy: "Always".to_owned(),
             pull_secrets: None,
         };
@@ -1733,7 +1733,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-nodes-default",
@@ -2131,7 +2131,7 @@ mod tests {
                     "value": "$(_POD_NAME).my-opensearch-cluster-nodes-default-headless.default.svc.cluster.local"
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "opensearch",
             "ports": [
@@ -2241,7 +2241,7 @@ mod tests {
                     "value": "info",
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "vector",
             "resources": {
@@ -2326,7 +2326,7 @@ mod tests {
                     },
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "update-security-config",
             "resources": {
@@ -2437,7 +2437,7 @@ mod tests {
                 "/bin/bash",
                 "-c"
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "init-keystore",
             "resources": {},
@@ -2477,7 +2477,7 @@ mod tests {
                     },
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "create-admin-certificate",
             "resources": {
@@ -3107,7 +3107,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                         "restarter.stackable.tech/enabled": "true"
                     },
@@ -3146,7 +3146,7 @@ mod tests {
                                 "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                 "app.kubernetes.io/name": "opensearch",
                                 "app.kubernetes.io/role-group": "default",
-                                "app.kubernetes.io/version": "3.4.0",
+                                "app.kubernetes.io/version": "3.6.0",
                                 "stackable.tech/opensearch-role.cluster_manager": "true",
                                 "stackable.tech/opensearch-role.data": "true",
                                 "stackable.tech/opensearch-role.ingest": "true",
@@ -3195,7 +3195,7 @@ mod tests {
                                     "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                     "app.kubernetes.io/name": "opensearch",
                                     "app.kubernetes.io/role-group": "default",
-                                    "app.kubernetes.io/version": "3.4.0",
+                                    "app.kubernetes.io/version": "3.6.0",
                                     "stackable.tech/vendor": "Stackable"
                                 },
                                 "name": "listener"
@@ -3225,7 +3225,7 @@ mod tests {
                                     "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                     "app.kubernetes.io/name": "opensearch",
                                     "app.kubernetes.io/role-group": "default",
-                                    "app.kubernetes.io/version": "3.4.0",
+                                    "app.kubernetes.io/version": "3.6.0",
                                     "stackable.tech/vendor": "Stackable",
                                 },
                                 "name": "discovery-service-listener",
@@ -3310,7 +3310,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "prometheus.io/scrape": "true",
                         "stackable.tech/vendor": "Stackable"
                     },
@@ -3376,7 +3376,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-nodes-default",
diff --git a/rust/operator-binary/src/controller/preprocess.rs b/rust/operator-binary/src/controller/preprocess.rs
index 0a084776..08383c46 100644
--- a/rust/operator-binary/src/controller/preprocess.rs
+++ b/rust/operator-binary/src/controller/preprocess.rs
@@ -88,7 +88,7 @@ mod tests {
             },
             "spec": {
                 "image": {
-                    "productVersion": "3.4.0"
+                    "productVersion": "3.6.0"
                 },
                 "clusterConfig": {
                     "security": {
diff --git a/rust/operator-binary/src/controller/validate.rs b/rust/operator-binary/src/controller/validate.rs
index d14a3f5c..02fb404a 100644
--- a/rust/operator-binary/src/controller/validate.rs
+++ b/rust/operator-binary/src/controller/validate.rs
@@ -508,20 +508,20 @@ mod tests {
         assert_eq!(
             Some(ValidatedCluster::new(
                 ResolvedProductImage {
-                    product_version: "3.4.0".to_owned(),
+                    product_version: "3.6.0".to_owned(),
                     app_version_label_value: LabelValue::from_str(&format!(
-                        "3.4.0-stackable{pkg_version}",
+                        "3.6.0-stackable{pkg_version}",
                         pkg_version = built_info::PKG_VERSION
                     ))
                     .expect("should be a valid label value"),
                     image: format!(
-                        "oci.example.org/opensearch:3.4.0-stackable{pkg_version}",
+                        "oci.example.org/opensearch:3.6.0-stackable{pkg_version}",
                         pkg_version = built_info::PKG_VERSION
                     ),
                     image_pull_policy: "Always".to_owned(),
                     pull_secrets: None,
                 },
-                ProductVersion::from_str_unsafe("3.4.0"),
+                ProductVersion::from_str_unsafe("3.6.0"),
                 ClusterName::from_str_unsafe("my-opensearch"),
                 NamespaceName::from_str_unsafe("default"),
                 uuid!("e6ac237d-a6d4-43a1-8135-f36506110912"),
@@ -1021,7 +1021,7 @@ mod tests {
                 ..ObjectMeta::default()
             },
             spec: v1alpha1::OpenSearchClusterSpec {
-                image: serde_json::from_str(r#"{"productVersion": "3.4.0"}"#)
+                image: serde_json::from_str(r#"{"productVersion": "3.6.0"}"#)
                     .expect("should be a valid ProductImage structure"),
                 cluster_config: v1alpha1::OpenSearchClusterConfig {
                     tls: v1alpha1::OpenSearchTls::default(),
diff --git a/rust/operator-binary/src/crd/roundtrip_test_data.yaml b/rust/operator-binary/src/crd/roundtrip_test_data.yaml
index 3f8eef33..a75a6bea 100644
--- a/rust/operator-binary/src/crd/roundtrip_test_data.yaml
+++ b/rust/operator-binary/src/crd/roundtrip_test_data.yaml
@@ -1,6 +1,6 @@
 ---
 image:
-  productVersion: 3.4.0
+  productVersion: 3.6.0
   pullPolicy: IfNotPresent
 clusterOperation:
   reconciliationPaused: false
@@ -117,8 +117,8 @@ nodes:
       replicas: 2
 ---
 image:
-  custom: oci.example.com/namespace/opensearch:3.4.0-custom
-  productVersion: 3.4.0
+  custom: oci.example.com/namespace/opensearch:3.6.0-custom
+  productVersion: 3.6.0
   pullPolicy: Always
   pullSecrets:
     - name: registry-credentials
diff --git a/rust/operator-binary/src/framework/types/operator.rs b/rust/operator-binary/src/framework/types/operator.rs
index 8ebb09fc..de716909 100644
--- a/rust/operator-binary/src/framework/types/operator.rs
+++ b/rust/operator-binary/src/framework/types/operator.rs
@@ -18,7 +18,7 @@ attributed_string_type! {
 attributed_string_type! {
     ProductVersion,
     "The version of a product",
-    "3.4.0",
+    "3.6.0",
     is_valid_label_value
 }
 
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 927c35d6..a7395e79 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -4,9 +4,10 @@ dimensions:
     values:
       - 3.1.0
       - 3.4.0
+      - 3.6.0
       # To use a custom image, add a comma and the full name after the product version, e.g.:
-      # - 3.4.0,oci.stackable.tech/sandbox/opensearch:3.4.0-stackable0.0.0-dev
-      # - 3.4.0,localhost:5000/sdp/opensearch:3.4.0-stackable0.0.0-dev
+      # - 3.6.0,oci.stackable.tech/sandbox/opensearch:3.6.0-stackable0.0.0-dev
+      # - 3.6.0,localhost:5000/sdp/opensearch:3.6.0-stackable0.0.0-dev
   - name: opensearch_home
     values:
       - /stackable/opensearch
@@ -96,6 +97,6 @@ suites:
     patch:
       - dimensions:
           - name: opensearch
-            expr: 3.4.0,opensearchproject/opensearch:3.4.0
+            expr: 3.6.0,opensearchproject/opensearch:3.6.0
           - name: opensearch_home
             expr: /usr/share/opensearch