diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml
index 5836994..fb449b3 100755
--- a/charts/graylog/Chart.yaml
+++ b/charts/graylog/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: graylog
 home: https://www.graylog.org
-version: 2.3.19
+version: 2.4.0
 appVersion: 6.3.3
 description: Graylog is the centralized log management solution built to open
   standards for capturing, storing, and enabling real-time analysis of terabytes
diff --git a/charts/graylog/templates/master-service.yaml b/charts/graylog/templates/master-service.yaml
index 048780b..b839185 100644
--- a/charts/graylog/templates/master-service.yaml
+++ b/charts/graylog/templates/master-service.yaml
@@ -37,7 +37,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ template "graylog.name" . }}
     app.kubernetes.io/instance: "{{ .Release.Name }}"
-    graylog-role: "master"
+    statefulset.kubernetes.io/pod-name: {{ template "graylog.fullname" . }}-0
   type: "{{ .Values.graylog.service.type }}"
 {{- if eq "LoadBalancer" .Values.graylog.service.master.type }}
   {{- if .Values.graylog.service.master.loadBalancerIP }}
diff --git a/charts/graylog/values.yaml b/charts/graylog/values.yaml
index 608492d..3a22325 100644
--- a/charts/graylog/values.yaml
+++ b/charts/graylog/values.yaml
@@ -606,7 +606,11 @@ opensearch:
       value: "true"
     - name: OPENSEARCH_INITIAL_ADMIN_PASSWORD
       value: "Graylog@2024"  # Strong password meeting requirements: uppercase, lowercase, number, special char, >8 chars
+  ## Set number of OpenSearch nodes
+  ##
+  replicas: 3
   ## Set default resource very low. This help reduce resources usage on GitHub Action when performing chart-testing.
+  ##
   opensearchJavaOpts: "-Xmx128M -Xms128M"
   resources:
     requests:
@@ -621,7 +625,17 @@ opensearch:
   #       storage: 30Gi # default 30Gi
 
 # Specify Mongodb settings. Ignore this section if you install MongoDB manually.
+#
 mongodb:
+  ## Default Bitnami MongoDB image in the chart does not support Arm64 architecture.
+  ## Uncomment the following section `image` and `global.security.allowInsecureImages` to use another Bitnami MongoDB image.
+  ##
+  # image:
+  #   repository: bitnamisecure/mongodb
+  #   tag: latest
+  # global:
+  #   security:
+  #     allowInsecureImages: true
   architecture: "replicaset"
   useStatefulSet: true
   replicaCount: 1