diff --git a/docker-compose/docker-compose.base.yml b/docker-compose/docker-compose.base.yml
index 30bc6f0a..176b8fda 100644
--- a/docker-compose/docker-compose.base.yml
+++ b/docker-compose/docker-compose.base.yml
@@ -310,15 +310,15 @@ services:
         condition: "service_started"
         required: false
     environment:
-      - JAVA_TOOL_OPTIONS=-Xmx576m
+      - JAVA_TOOL_OPTIONS=-Xmx576m #deployment: 3072m for large networks
     command: --server.port=80 --spring.config.additional-location=/config/
     sysctls:
       - net.ipv4.ip_unprivileged_port_start=0 # for docker < 20.03.0
-    memswap_limit: 1g 
+    memswap_limit: 1g  #deployment: 4540m for large networks
     deploy:
       resources:
         limits:
-          memory: 1g 
+          memory: 1g  #deployment: 4540m for large networks
 
   loadflow-server:
     profiles:
diff --git a/k8s/resources/common/network-conversion-server-deployment.yaml b/k8s/resources/common/network-conversion-server-deployment.yaml
index f6c0f4f6..67b70ca7 100644
--- a/k8s/resources/common/network-conversion-server-deployment.yaml
+++ b/k8s/resources/common/network-conversion-server-deployment.yaml
@@ -12,7 +12,6 @@ metadata:
     gridsuite.org/springboot-with-s3: "true"
   annotations:
     gridsuite.org/cpu: cpu-xl
-    gridsuite.org/memory: memory-xxl
 spec:
   selector:
     matchLabels:
@@ -25,6 +24,14 @@ spec:
       containers:
       - name: main
         image: docker.io/powsybl/network-conversion-server:latest
+        env:
+            - name: JAVA_TOOL_OPTIONS
+              value: "-Xmx3072m"
+        resources:
+            requests:
+              memory: "4540Mi"
+            limits:
+              memory: "4540Mi"
         volumeMounts:
         - mountPath: /config/specific
           name: network-conversion-server-configmap-specific-volume