diff --git a/charts/aai-babel/values.yaml b/charts/aai-babel/values.yaml
index 01b4dfc..59c3366 100644
--- a/charts/aai-babel/values.yaml
+++ b/charts/aai-babel/values.yaml
@@ -78,3 +78,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-cassandra/values.yaml b/charts/aai-cassandra/values.yaml
index 22055d6..1e1d2c1 100644
--- a/charts/aai-cassandra/values.yaml
+++ b/charts/aai-cassandra/values.yaml
@@ -100,7 +100,7 @@
   storageType: local
   storageClass: ""
 
-  
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/aai-champ/values.yaml b/charts/aai-champ/values.yaml
index 75ecffb..9e1c9bd 100644
--- a/charts/aai-champ/values.yaml
+++ b/charts/aai-champ/values.yaml
@@ -77,6 +77,7 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
 
 # XML beans configuration
 event:
diff --git a/charts/aai-data-router/values.yaml b/charts/aai-data-router/values.yaml
index 06c64c3..ba42582 100644
--- a/charts/aai-data-router/values.yaml
+++ b/charts/aai-data-router/values.yaml
@@ -82,23 +82,6 @@
   mountPath: /dockerdata-nfs
   mountSubPath: aai/data-router/logs
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
 resources:
   small:
     limits:
@@ -114,3 +97,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
\ No newline at end of file
diff --git a/charts/aai-elasticsearch/values.yaml b/charts/aai-elasticsearch/values.yaml
index c6afbb5..a800c4e 100644
--- a/charts/aai-elasticsearch/values.yaml
+++ b/charts/aai-elasticsearch/values.yaml
@@ -80,23 +80,6 @@
   mountPath: /dockerdata-nfs
   mountSubPath: aai/elasticsearch/data
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
 resources:
   small:
     limits:
@@ -112,3 +95,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-gizmo/values.yaml b/charts/aai-gizmo/values.yaml
index d34ff2b..6ad25c5 100644
--- a/charts/aai-gizmo/values.yaml
+++ b/charts/aai-gizmo/values.yaml
@@ -74,3 +74,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-graphadmin/values.yaml b/charts/aai-graphadmin/values.yaml
index 3b7bd60..b7af3d0 100644
--- a/charts/aai-graphadmin/values.yaml
+++ b/charts/aai-graphadmin/values.yaml
@@ -44,10 +44,10 @@
     limit: 180000
 
   # Default maximum records to fix for the data grooming and dupeTool
-  maxFix: 
+  maxFix:
     dataGrooming: 150
     dupeTool: 25
-    
+
   # Default number of sleep minutes for dataGrooming and dupeTool
   sleepMinutes:
     dataGrooming: 7
@@ -107,23 +107,6 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
 resources:
   small:
     limits:
@@ -139,3 +122,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-modelloader/values.yaml b/charts/aai-modelloader/values.yaml
index e406443..1617fc0 100644
--- a/charts/aai-modelloader/values.yaml
+++ b/charts/aai-modelloader/values.yaml
@@ -61,23 +61,7 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
+
 resources:
   small:
     limits:
@@ -93,3 +77,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-resources/values.yaml b/charts/aai-resources/values.yaml
index e9a0063..8e50ba0 100644
--- a/charts/aai-resources/values.yaml
+++ b/charts/aai-resources/values.yaml
@@ -35,10 +35,10 @@
   # Specifies crud related operation timeouts and overrides
   crud:
     timeout:
-      # Specifies if the timeout for REST GET calls should be enabled 
+      # Specifies if the timeout for REST GET calls should be enabled
       enabled: true
       # Specifies the timeout values for application specific
-      # Its a pipe seperated list where each element before comma represents 
+      # Its a pipe seperated list where each element before comma represents
       # the X-FromAppId and the comma after specifies the timeout limit in ms
       # If the timeout limit is -1 then it means for these apps no timeout
       appspecific: JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAIRctFeed,-1|NewvceCreator,-1|IANewvceCreator,-1|AAI-CSIOVALS,-1
@@ -111,3 +111,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-search-data/values.yaml b/charts/aai-search-data/values.yaml
index bfde398..b58350c 100644
--- a/charts/aai-search-data/values.yaml
+++ b/charts/aai-search-data/values.yaml
@@ -61,23 +61,6 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
 resources:
   small:
     limits:
@@ -93,3 +76,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-sparky-be/values.yaml b/charts/aai-sparky-be/values.yaml
index 47b5a1d..a323d29 100644
--- a/charts/aai-sparky-be/values.yaml
+++ b/charts/aai-sparky-be/values.yaml
@@ -82,23 +82,8 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
 resources:
   small:
     limits:
@@ -114,3 +99,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/charts/aai-spike/values.yaml b/charts/aai-spike/values.yaml
index 4fc3a0b..af59f9a 100644
--- a/charts/aai-spike/values.yaml
+++ b/charts/aai-spike/values.yaml
@@ -75,6 +75,7 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
 
 # XML bean configuration
 event:
diff --git a/charts/aai-traversal/values.yaml b/charts/aai-traversal/values.yaml
index 83bd1a9..4e65125 100644
--- a/charts/aai-traversal/values.yaml
+++ b/charts/aai-traversal/values.yaml
@@ -75,23 +75,8 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
+# Configure resource requests and limits
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
 resources:
   small:
     limits:
@@ -107,3 +92,4 @@
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}
diff --git a/values.yaml b/values.yaml
index 2345b3f..bf1602e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -242,16 +242,6 @@
 ingress:
   enabled: false
 
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
   small:
     limits:
@@ -267,3 +257,4 @@
     requests:
       cpu: 2
       memory: 2Gi
+  unlimited: {}
\ No newline at end of file