diff --git a/sogo/configmap.yaml b/sogo/configmap.yaml
index 200bb6c..f3e7570 100644
--- a/sogo/configmap.yaml
+++ b/sogo/configmap.yaml
@@ -12,10 +12,10 @@ data:
     SOGoForceIMAPLoginWithEmail: true
 
     # Database Configuration
-    SOGoProfileURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_user_profile?sslmode=disable"
-    OCSFolderInfoURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_folder_info?sslmode=disable"
-    OCSSessionsFolderURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_sessions_folder?sslmode=disable"
-    OCSAclURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_acl?sslmode=disable"
+    SOGoProfileURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_user_profile?sslmode=require"
+    OCSFolderInfoURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_folder_info?sslmode=require"
+    OCSSessionsFolderURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_sessions_folder?sslmode=require"
+    OCSAclURL: "postgresql://sogo:${POSTGRES_PASSWORD}@sogo-postgres-rw.sogo.svc.cluster.local:5432/sogo/sogo_acl?sslmode=require"
 
     # General Settings
     SOGoTimeZone: Europe/Amsterdam
diff --git a/sogo/postgresql-cluster.yaml b/sogo/postgresql-cluster.yaml
index dbe0ae0..e2394e7 100644
--- a/sogo/postgresql-cluster.yaml
+++ b/sogo/postgresql-cluster.yaml
@@ -23,4 +23,3 @@ spec:
     parameters:
       max_connections: "100"
       shared_buffers: "256MB"
-      ssl: "off"