diff --git a/mesh/deployment.yaml b/mesh/deployment.yaml
index 1e162d6c..585eb898 100644
--- a/mesh/deployment.yaml
+++ b/mesh/deployment.yaml
@@ -35,6 +35,13 @@ ingestion:
           secretName: rest-ingestion.crt
 delivery:
   blueprint-web:
+    stateful: true
+    volumes:
+      repository-volume:
+        size: 10Gi
+      rocksdb:
+        mountPath: "/var/lib/rocksdb"
+        size: 5Gi
     ingress:
       enabled: true
       hosts:
@@ -101,6 +108,11 @@ delivery:
             successThreshold: 1
             failureThreshold: 3
   blueprint-search:
+    stateful: true
+    volumes:
+      rocksdb:
+        mountPath: "/var/lib/rocksdb"
+        size: 5Gi
     ingress:
       enabled: true
       hosts:
@@ -133,6 +145,10 @@ delivery:
     components:
       opensearch:
         sidecar: true
+        volumes:
+          opensearch-data:
+            mountPath: /usr/share/opensearch/data
+            size: 10Gi
         probes:
           readiness:
             httpGet:
diff --git a/mesh/mesh.yaml b/mesh/mesh.yaml
index a3f85718..17192aef 100644
--- a/mesh/mesh.yaml
+++ b/mesh/mesh.yaml
@@ -228,7 +228,6 @@ delivery:
       indexable-resource-fragments:
         topic: outboxes/indexable-resource-fragments
     port: 8082
-    repositoryVolume: "/usr/share/opensearch/data"
     volumesFrom:
       configs:
         - "opensearch/service-init:/deployments/opensearch/service-init"
@@ -238,7 +237,7 @@ delivery:
       STREAMX_BLUEPRINTS_OPENSEARCH-DELIVERY-SERVICE_MIGRATION-SCRIPT-LOCATIONS: "classpath:opensearch/service-init,file:opensearch/service-init"
       # Keep stores up to date when container inside a pod restarts
       QUASAR_MESSAGING_STORE_BACKEND: "rocksdb"
-      QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/usr/share/opensearch/data"
+      QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/var/lib/rocksdb"
     environmentFrom:
       secrets:
         - "opensearch-secrets.properties"
@@ -247,7 +246,6 @@ delivery:
         image: "docker.io/opensearchproject/opensearch:2.16.0"
         ports:
           - 9201:9201
-        repositoryVolume: "/usr/share/opensearch/data"
         environment:
           network.host: "0.0.0.0"
           http.port: "9201"
@@ -272,7 +270,7 @@ delivery:
       STREAMX_URL-INCLUDE-REPLACEMENT-PROVIDER_SSI-INCLUDE-FALLBACK-CONTENT: "<!-- Include Not Found -->"
       # Keep stores up to date when container inside a pod restarts
       QUASAR_MESSAGING_STORE_BACKEND: "rocksdb"
-      QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/srv/www"
+      QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/var/lib/rocksdb"
     repositoryVolume: "/srv/www"
     port: 8083
     components:
diff --git a/terraform/azure/platform/main.tf b/terraform/azure/platform/main.tf
index eb1599c4..8c15cdb3 100644
--- a/terraform/azure/platform/main.tf
+++ b/terraform/azure/platform/main.tf
@@ -55,7 +55,7 @@ module "grafana_secret" {
 
 module "streamx" {
   source  = "streamx-dev/charts/helm"
-  version = "0.0.13"
+  version = "0.0.15"
 
   ingress_controller_nginx_enabled                         = false
   cert_manager_lets_encrypt_issuer_acme_email              = var.cert_manager_lets_encrypt_issuer_acme_email
@@ -64,10 +64,14 @@ module "streamx" {
   pulsar_kaap_values = [
     file("${path.module}/config/pulsar-kaap/values.yaml")
   ]
+
   streamx_operator_image_pull_secret_registry_email    = var.streamx_operator_image_pull_secret_registry_email
   streamx_operator_image_pull_secret_registry_password = var.streamx_operator_image_pull_secret_registry_password
   streamx_operator_chart_repository_username           = "_json_key_base64"
   streamx_operator_chart_repository_password           = var.streamx_operator_image_pull_secret_registry_password
+  streamx_operator_settings = {
+    "image.tag" : "0.0.17-jvm"
+  }
 
   ingress_controller_apisix_settings = var.public_ip_address != null && var.public_ip_address != "" ? {
     "gateway.annotations.service\\.beta\\.kubernetes\\.io/azure-load-balancer-resource-group" : var.resource_group_name