diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 6e96f74e..d4745b5d 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -164,9 +164,9 @@ Usage:
 Raft cluster configuration settings
 */}}
 {{- define "raft_configuration" -}}
-  {{- $replicas := .Values.replicas | int -}}
+  {{- $voters := .Values.env.RAFT_BOOTSTRAP_EXPECT | int -}}
   {{- $nodes := list -}}
-  {{- range $i := until $replicas -}}
+  {{- range $i := until $voters -}}
     {{- $node_name := list -}}
     {{- $node_name = append $node_name "weaviate" -}}
     {{- $node_name = append $node_name $i -}}
@@ -174,6 +174,4 @@ Raft cluster configuration settings
   {{- end }}
           - name: RAFT_JOIN
             value: "{{ join "," $nodes }}"
-          - name: RAFT_BOOTSTRAP_EXPECT
-            value: {{ $replicas | quote }}
 {{- end -}}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index dfcde64f..b6b6c1c8 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -7,8 +7,8 @@ image:
   # of weaviate. In accordance with Infra-as-code, you should pin this value
   # down and only change it if you explicitly want to upgrade the Weaviate
   # version.
-  tag: 1.22.5
-  repo: semitechnologies/weaviate
+  tag: latest
+  repo: library/module_test_image_raft
   # Image pull policy: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
   pullPolicy: IfNotPresent
   pullSecrets: []
@@ -62,6 +62,7 @@ initContainers:
 # to cases where no data is imported yet. Scaling down after importing data may
 # break usability. Full dynamic scalability will be added in a future release.
 replicas: 1
+
 # Define how pods will be created. Possible values: OrderedReady | Parallel
 # OrderedReady - pods will be created one after another
 # Parallel - all pods will be created at once
@@ -229,7 +230,9 @@ env:
 
   # Raft settings are generated automatically by "raft_configuration" template
   # Set Raft cluster bootstrap timeout (in seconds), default is 10 (seconds)
-  # RAFT_BOOTSTRAP_TIMEOUT: 30
+  RAFT_BOOTSTRAP_TIMEOUT: 30
+  RAFT_BOOTSTRAP_EXPECT: 1
+
 
   # Set a MEM limit for the Weaviate Pod so it can help you both increase GC-related 
   # performance as well as avoid GC-related out-of-memory (“OOM”) situations