diff --git a/apigateway/helm/templates/deployment.yaml b/apigateway/helm/templates/deployment.yaml
index 351dce4..5923120 100644
--- a/apigateway/helm/templates/deployment.yaml
+++ b/apigateway/helm/templates/deployment.yaml
@@ -31,6 +31,9 @@ spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
+  {{- if .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "common.labels.matchLabels" . | nindent 6 }}
diff --git a/apigateway/helm/templates/elasticsearch.yaml b/apigateway/helm/templates/elasticsearch.yaml
index 00f79da..adf9f08 100644
--- a/apigateway/helm/templates/elasticsearch.yaml
+++ b/apigateway/helm/templates/elasticsearch.yaml
@@ -99,6 +99,9 @@ spec:
             {{ toYaml . | nindent 12 }}
             {{- end }}
         spec:
+          {{- with .Values.revisionHistoryLimit }}
+            revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+          {{- end }}
           {{- with .Values.elasticsearch.affinity }}
           affinity:
             {{- tpl (toYaml .) $context  | nindent 12 }}
@@ -144,4 +147,4 @@ spec:
               memory: 100Mi                    
           {{- end }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/apigateway/helm/templates/kibana.yaml b/apigateway/helm/templates/kibana.yaml
index 4a1b1aa..06483fd 100644
--- a/apigateway/helm/templates/kibana.yaml
+++ b/apigateway/helm/templates/kibana.yaml
@@ -86,6 +86,9 @@ spec:
         {{ toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.revisionHistoryLimit }}
+      revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+      {{- end }}
       {{- with .Values.kibana.affinity }}
       affinity:
         {{- tpl (toYaml .) $context  | nindent 8 }}
@@ -170,4 +173,4 @@ spec:
           {{- end }}
         {{- if .Values.kibana.extraContainers }}
         {{- toYaml .Values.kibana.extraContainers | nindent 8 }}
-        {{- end }}
\ No newline at end of file
+        {{- end }}
diff --git a/apigateway/helm/templates/nginx-deployment.yaml b/apigateway/helm/templates/nginx-deployment.yaml
index 09b44dd..9f7ecbc 100644
--- a/apigateway/helm/templates/nginx-deployment.yaml
+++ b/apigateway/helm/templates/nginx-deployment.yaml
@@ -30,6 +30,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}-nginx
 spec:
   replicas: 1
+  {{- if .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "common.labels.matchLabels" . | nindent 6 }}
@@ -82,4 +85,4 @@ spec:
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
 
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
index c16c729..83bf6f0 100644
--- a/apigateway/helm/values.yaml
+++ b/apigateway/helm/values.yaml
@@ -1,5 +1,8 @@
 replicaCount: 1
 
+# -- The number of old ReplicaSets to retain to allow rollback.
+# revisionHistoryLimit: 10
+
 image:
   # -- The repository for the image. By default, 
   # this points to the Software AG container repository.