diff --git a/Dockerfile b/Dockerfile
index f7462d2..4dfac3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -116,6 +116,7 @@ RUN a2enmod \
         proxy \
         proxy_http \
         rewrite \
+        remoteip \
         ssl && \
     echo "/usr/local/lib/sogo" > /etc/ld.so.conf.d/sogo.conf && \
     ldconfig && \
@@ -127,6 +128,13 @@ RUN a2enmod \
     ln -s /usr/local/sbin/sogo-ealarms-notify /usr/sbin/sogo-ealarms-notify && \
     ln -s /usr/local/sbin/sogo-slapd-sockd /usr/sbin/sogo-slapd-sockd && \
     ln -s /etc/apache2/conf-available/SOGo.conf /etc/apache2/conf-enabled/SOGo.conf && \
+    {\
+     echo RemoteIPHeader X-Real-IP ;\
+     echo RemoteIPInternalProxy 10.0.0.0/8 ;\
+     echo RemoteIPInternalProxy 172.16.0.0/12 ;\
+     echo RemoteIPInternalProxy 192.168.0.0/16 ;\
+    } > /etc/apache2/conf-available/remoteip.conf && \
+    a2enconf remoteip && \
     mkdir -p /etc/cron.d /etc/default /etc/sogo /etc/logrotate.d && \
     mv /usr/share/doc/sogo/sogo.cron /etc/cron.d/sogo && \
     mv /usr/share/doc/sogo/sogo-default /etc/default/sogo && \
diff --git a/charts/sogo/Chart.yaml b/charts/sogo/Chart.yaml
index dbb97b6..cf92b42 100644
--- a/charts/sogo/Chart.yaml
+++ b/charts/sogo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: sogo
-version: 0.1.9
+version: 0.1.10
 description: A helm chart for the docker-sogo docker image
 type: application
 keywords:
diff --git a/charts/sogo/values.yaml b/charts/sogo/values.yaml
index 1c07c49..1cd70ae 100644
--- a/charts/sogo/values.yaml
+++ b/charts/sogo/values.yaml
@@ -87,6 +87,7 @@ sogo:
   # Array of secret names containing the configurations
   # All secret values will be parsed as a string by default
   # To parse a secret value as a YAML, you must append "__yaml" to the secret key
+  # NOTE: All keys in the secrets will be imported as a SOGo configuration.
   existingSecrets: []
     # - secretName1
     # - secretName2
@@ -168,14 +169,12 @@ sogo:
       size: 8Gi
 
   ## Strategy used to replace old pods
-  ## IMPORTANT: use with care, it is suggested to leave as that for upgrade purposes
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
   strategy:
-    type: Recreate
-    # type: RollingUpdate
-    # rollingUpdate:
-    #   maxSurge: 1
-    #   maxUnavailable: 0
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
 
   ##
   ## Extra environment variables