diff --git a/geoserver-lb/Chart.yaml b/geoserver-lb/Chart.yaml
index 03ba81c..7ba452f 100644
--- a/geoserver-lb/Chart.yaml
+++ b/geoserver-lb/Chart.yaml
@@ -2,5 +2,5 @@ name: geoserver-lb
 apiVersion: v2
 description: A Helm chart for deploying geoserver loadbalanced
 type: application
-version: 0.6.4
+version: 1.0.0
 appVersion: "22.0.4"
diff --git a/geoserver-lb/templates/geoserver-deploy.yaml b/geoserver-lb/templates/geoserver-deploy.yaml
index eef3eb0..c29b5ec 100644
--- a/geoserver-lb/templates/geoserver-deploy.yaml
+++ b/geoserver-lb/templates/geoserver-deploy.yaml
@@ -209,7 +209,8 @@ spec:
         - containerPort: 8080
           name: http-proxy
           protocol: TCP
-        resources: {}
+        resources:
+          {{- toYaml .Values.geoserver.resources | nindent 10 }}
         startupProbe:
           failureThreshold: 5
           periodSeconds: 40
diff --git a/geoserver-lb/templates/geoserver-lb-deploy.yaml b/geoserver-lb/templates/geoserver-lb-deploy.yaml
index fd23df1..726d6f1 100644
--- a/geoserver-lb/templates/geoserver-lb-deploy.yaml
+++ b/geoserver-lb/templates/geoserver-lb-deploy.yaml
@@ -51,12 +51,7 @@ spec:
             {{ .Values.geoserver.extra_volumeMounts | toYaml | nindent 10 }}
           {{- end }}
           resources:
-            requests:
-              memory: "64Mi"
-              cpu: "100m"
-            limits:
-              memory: "128Mi"
-              cpu: "500m"
+          {{- toYaml .Values.nginx.resources | nindent 10 }}
           livenessProbe:
             failureThreshold: 10
             tcpSocket:
diff --git a/geoserver-lb/values.yaml b/geoserver-lb/values.yaml
index 0eba827..5539ee8 100644
--- a/geoserver-lb/values.yaml
+++ b/geoserver-lb/values.yaml
@@ -3,6 +3,12 @@ geoserver:
   # This is the url to the service provided by the geOrchestra helm chart
   master_svc_url: georchestra-geoserver-svc:8080
   docker_image: registry.com/org/client-configuration/geoserver:22.0.4
+  resources:
+    requests:
+      memory: "2048Mi"
+      cpu: "100m"
+    limits:
+      memory: "8192Mi"
   livenessProbe:
     httpGet:
       path: /geoserver/gwc/service/wmts?SERVICE=WMTS&REQUEST=GetCapabilities
@@ -29,6 +35,11 @@ geoserver:
         claimName: georchestra-geoserver-datadir
 
 nginx:
+  resources:
+    requests:
+      memory: "64Mi"
+    limits:
+      memory: "128Mi"
   image:
     repository: docker.io
     name: nginx