diff --git a/charts/redis-stack-server/Chart.yaml b/charts/redis-stack-server/Chart.yaml
index c29a0d1..98fcb13 100644
--- a/charts/redis-stack-server/Chart.yaml
+++ b/charts/redis-stack-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.14
+version: 0.4.15
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/redis-stack-server/templates/redis-stack-server.yaml b/charts/redis-stack-server/templates/redis-stack-server.yaml
deleted file mode 100644
index 5ce22d3..0000000
--- a/charts/redis-stack-server/templates/redis-stack-server.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: "{{ .Values.name }}"
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: "{{ .Values.name }}"
-spec:
-  ports:
-  - port: {{ .Values.redis_stack_server.port }}
-    name: db
-  type: NodePort
-  selector:
-    app: "{{ .Values.name }}"
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: "{{ .Values.name }}"
-spec:
-  selector:
-    matchLabels:
-      app: "{{ .Values.name }}"
-  serviceName: "{{ .Values.name }}"
-  replicas: {{ .Values.redis_stack_server.replicas }}
-  template:
-    metadata:
-      labels:
-        app: "{{ .Values.name }}"
-    spec:
-      terminationGracePeriodSeconds: 10
-      containers:
-      - name: "{{ .Values.name }}"
-        image: {{ .Values.redis_stack_server.image }}:{{ .Values.redis_stack_server.tag }}
-        imagePullPolicy: Always
-        ports:
-        - containerPort: {{ .Values.redis_stack_server.port }}
-          name: db
-        volumeMounts:
-        - name: db
-          mountPath: /data
-  volumeClaimTemplates:
-  - metadata:
-      name: db
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      storageClassName: {{ .Values.redis_stack_server.storage_class }}
-      resources:
-        requests:
-          storage: {{ .Values.redis_stack_server.storage }}
-{{- if .Values.redis_stack_server.affinity }}
-      affinity:
-{{ toYaml .Values.redis_stack_server.affinity | indent 8 }}
-{{- end }}
diff --git a/charts/redis-stack-server/templates/service.yaml b/charts/redis-stack-server/templates/service.yaml
new file mode 100644
index 0000000..4c071af
--- /dev/null
+++ b/charts/redis-stack-server/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Values.name }}"
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: "{{ .Values.name }}"
+spec:
+  ports:
+  - port: {{ .Values.redis_stack_server.service.port }}
+    name: {{ .Values.name }}
+  type: {{ .Values.redis_stack_server.service.type }}
+  selector:
+    app: "{{ .Values.name }}"
+
diff --git a/charts/redis-stack-server/templates/statefulset.yaml b/charts/redis-stack-server/templates/statefulset.yaml
new file mode 100644
index 0000000..47772fe
--- /dev/null
+++ b/charts/redis-stack-server/templates/statefulset.yaml
@@ -0,0 +1,66 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: "{{ .Values.name }}"
+spec:
+  selector:
+    matchLabels:
+      app: "{{ .Values.name }}"
+  serviceName: "{{ .Values.name }}"
+  replicas: {{ .Values.redis_stack_server.replicas }}
+  template:
+    metadata:
+      labels:
+        app: "{{ .Values.name }}"
+    spec:
+      terminationGracePeriodSeconds: 10
+      containers:
+      - name: "{{ .Values.name }}"
+        image: {{ .Values.redis_stack_server.image }}:{{ .Values.redis_stack_server.tag }}
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 6379
+          name: redis
+        {{- if .Values.redis_stack_server.persistence.enabled }}
+        volumeMounts:
+        - name: redis-data
+          mountPath: /data
+        {{- end }}
+        resources:
+          {{- if .Values.redis_stack_server.resources }}
+          requests:
+            memory: {{ .Values.redis_stack_server.resources.requests.memory }}
+            cpu: {{ .Values.redis_stack_server.resources.requests.cpu }}
+          limits:
+            memory: {{ .Values.redis_stack_server.resources.limits.memory }}
+            cpu: {{ .Values.redis_stack_server.resources.limits.cpu }}
+          {{- end }}
+        readinessProbe:
+          exec:
+            command:
+            - redis-cli
+            - ping
+          initialDelaySeconds: 5
+          periodSeconds: 20
+        livenessProbe:
+          exec:
+            command:
+            - redis-cli
+            - ping
+          initialDelaySeconds: 30
+          periodSeconds: 20
+  {{- if .Values.redis_stack_server.persistence.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: db
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: {{ .Values.redis_stack_server.storageClass }}
+      resources:
+        requests:
+          storage: {{ .Values.redis_stack_server.size | default "1Gi" }}
+  {{- end }}
+{{- if .Values.redis_stack_server.affinity }}
+      affinity:
+{{ toYaml .Values.redis_stack_server.affinity | indent 8 }}
+{{- end }}
diff --git a/charts/redis-stack-server/values.yaml b/charts/redis-stack-server/values.yaml
index d913f6e..b832781 100644
--- a/charts/redis-stack-server/values.yaml
+++ b/charts/redis-stack-server/values.yaml
@@ -1,9 +1,20 @@
 name: redis-stack-server
+
 redis_stack_server:
   image: "redis/redis-stack-server"
   tag: "7.4.0-v1"
-  port: 6379
   replicas: 1
-  storage_class: standard
-  storage: 1Gi
-  affinity: {}
+  resources:
+    limits:
+      cpu: 100m
+      memory: 128Mi
+    requests:
+      cpu: 100m
+      memory: 128Mi
+  persistence:
+    enabled: false
+    size: 1Gi
+    # storageClass: standard
+  service:
+    port: 6379
+    type: ClusterIP