diff --git a/helm/templates/mapproxinator/mapproxinator-configmap.yaml b/helm/templates/mapproxinator/mapproxinator-configmap.yaml
index e7e87be..753c8a5 100644
--- a/helm/templates/mapproxinator/mapproxinator-configmap.yaml
+++ b/helm/templates/mapproxinator/mapproxinator-configmap.yaml
@@ -33,7 +33,7 @@ data:
   SERVER_PORT: {{ .Values.mapproxinator.targetPort | quote }}
   CONFIG_PROVIDER: {{ $storage.mapproxyConfigProvider | quote }}
   POLL_TIMEOUT_FREQUENCY_MS: {{ .Values.mapproxinator.env.poll.timeout.frequencyMS | quote }}
-  GRACEFUL_RELOAD_MAX_SECONDS: {{ .Values.mapproxinator.env.gracefulReloadMaxSeconds | quote }}
+  GRACEFUL_RELOAD_MAX_SECONDS: {{ .Values.global.gracefulReloadMaxSeconds | quote }}
   S3_ENDPOINT_URL: {{ $s3.endpointUrl }}
   S3_BUCKET: {{ $s3.tilesBucket }}
   S3_SSL_ENABLED: {{ $s3.sslEnabled | quote }}
@@ -46,6 +46,5 @@ data:
   DB_SSL_PATH_CA: {{ .Values.mapproxinator.env.ssl.CA_FILE_LOCATION }}
   DB_SSL_PATH_KEY: {{ .Values.mapproxinator.env.ssl.KEY_FILE_LOCATION }}
   DB_SSL_PATH_CERT: {{ .Values.mapproxinator.env.ssl.CERT_FILE_LOCATION }}
-  GRACEFUL_RELOAD_MAX_SECONDS: {{ .Values.mapproxinator.env.gracefulReloadMaxSeconds | quote }}
   PGAPPNAME: {{ $chartName }}
 {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 8d36210..030a9ae 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -44,6 +44,7 @@ global:
     secretName: "root-ca"
     path: "/usr/local/share/ca-certificates"
     key: "ca.crt"
+  gracefulReloadMaxSeconds: 300
 
 authentication:
   ssl:
@@ -254,7 +255,7 @@ nginx:
   port: 8080
   internalServicePort: 80
   nginxTargetPort: &nginxTargetPort 8080
-  targetPort: *envoyPort  # --> if global.opalaEnabled is true use *nginxTargetPort else use *envoyPort | if no authorization is needed use *nginxTargetPort
+  targetPort: *envoyPort # --> if global.opalaEnabled is true use *nginxTargetPort else use *envoyPort | if no authorization is needed use *nginxTargetPort
   nodePort: 30003
 
   authorization:
@@ -406,7 +407,6 @@ mapproxinator:
     poll:
       timeout:
         frequencyMS: 5000
-    gracefulReloadMaxSeconds: 300
     logPrettyPrintEnabled: false
     responseCompressionEnabled: true
     requestPayloadLimit: 1mb
@@ -417,10 +417,6 @@ mapproxinator:
       CA_FILE_LOCATION: /opt/certs/ca/ca.pem
       KEY_FILE_LOCATION: /opt/certs/key/key.pem
       CERT_FILE_LOCATION: /opt/certs/cert/cert.pem
-    logPrettyPrintEnabled: false
-    gracefulReloadMaxSeconds: 300
-    responseCompressionEnabled: true
-    requestPayloadLimit: 1mb
   resources:
     enabled: false
     value: