diff --git a/charts/redis-stack-server/Chart.yaml b/charts/redis-stack-server/Chart.yaml
index e3cd1f8..65f3b83 100644
--- a/charts/redis-stack-server/Chart.yaml
+++ b/charts/redis-stack-server/Chart.yaml
@@ -15,10 +15,10 @@ 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.6
+version: 0.4.7
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "7.2.1"
+appVersion: "7.2.2"
diff --git a/charts/redis-stack-server/templates/redis-stack-server.yaml b/charts/redis-stack-server/templates/redis-stack-server.yaml
index 8e6fa66..cdc8f4c 100644
--- a/charts/redis-stack-server/templates/redis-stack-server.yaml
+++ b/charts/redis-stack-server/templates/redis-stack-server.yaml
@@ -9,7 +9,7 @@ spec:
   ports:
   - port: {{ .Values.redis_stack_server.port }}
     name: db
-  type: NodePort
+  type: {{ .Values.redis_stack_server.serviceType }}
   selector:
     app: "{{ .Values.name }}"
 ---
@@ -39,6 +39,24 @@ spec:
         volumeMounts:
         - name: db
           mountPath: /data
+        {{- with .Values.redis_stack_server.env }}
+        env:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.redis_stack_server.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{- end }}
+      {{- with .Values.redis_stack_server.nodeSelector }}
+      nodeSelector:
+        {{ range $key, $value := . }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
+      {{- with .Values.redis_stack_server.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
   volumeClaimTemplates:
   - metadata:
       name: db
diff --git a/charts/redis-stack-server/values.yaml b/charts/redis-stack-server/values.yaml
index dc18f6b..e22ad38 100644
--- a/charts/redis-stack-server/values.yaml
+++ b/charts/redis-stack-server/values.yaml
@@ -3,6 +3,27 @@ redis_stack_server:
   image: "redis/redis-stack-server"
   tag: "7.2.0-v6"
   port: 6379
+  serviceType: ClusterIP
   replicas: 1
-  storage_class: standard
+  storage_class: default
   storage: 1Gi
+  env:
+  - name: REDIS_ARGS
+    valueFrom:
+      secretKeyRef:
+        name: redis-stack-server
+        key: redis-args
+  resources:
+    limits:
+      cpu: 1
+      memory: 4G
+    requests:
+      cpu: 1
+      memory: 4G
+  nodeSelector:
+    type: app
+  tolerations:
+  - effect: NoSchedule
+    key: NodeType
+    operator: Equal
+    value: app
diff --git a/charts/redis-stack/Chart.yaml b/charts/redis-stack/Chart.yaml
index 2706b76..c1a5e45 100644
--- a/charts/redis-stack/Chart.yaml
+++ b/charts/redis-stack/Chart.yaml
@@ -15,10 +15,10 @@ 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.6
+version: 0.4.7
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "7.2.1"
+appVersion: "7.2.2"
diff --git a/charts/redis-stack/templates/deployment.yaml b/charts/redis-stack/templates/deployment.yaml
index bed1a0d..d558602 100644
--- a/charts/redis-stack/templates/deployment.yaml
+++ b/charts/redis-stack/templates/deployment.yaml
@@ -24,6 +24,10 @@ spec:
           name: db
         - containerPort: {{ .Values.redis_stack.redis_insight_port }}
           name: "{{ .Values.redis_stack.redis_insight }}"
+        {{- with .Values.redis_stack.env }}
+        env:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         {{- if .Values.redis_stack.resources }}
         resources:
           {{- if .Values.redis_stack.resources.requests }}
@@ -36,3 +40,13 @@ spec:
             cpu: "{{ .Values.redis_stack.cpu }}"
           {{- end}}
         {{- end}}
+      {{- with .Values.redis_stack.nodeSelector }}
+      nodeSelector:
+        {{ range $key, $value := . }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
+      {{- with .Values.redis_stack.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
diff --git a/charts/redis-stack/values.yaml b/charts/redis-stack/values.yaml
index 0cbad97..10d9338 100644
--- a/charts/redis-stack/values.yaml
+++ b/charts/redis-stack/values.yaml
@@ -8,3 +8,10 @@ redis_stack:
   replicas: 1
   memory: 1Gi
   cpu: 100m
+  nodeSelector:
+    type: app
+  tolerations:
+  - effect: NoSchedule
+    key: NodeType
+    operator: Equal
+    value: app