diff --git a/defaults/main.yml b/defaults/main.yml
index 4c07a62..deeaad9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,8 +13,7 @@ droneci_agent_image: "drone/agent:{{ droneci_version }}"
 droneci_agent_restart_policy: always
 
 droneci_postgres_enabled: False
-droneci_postgres_tls_enabled: False
-# droneci_postgres_ssl_mode: disabled
+droneci_postgres_ssl_mode: disable
 droneci_postgres_server: postgres.example.com:5432
 droneci_postgres_superuser: postgres
 droneci_postgres_password: secure
@@ -62,7 +61,7 @@ droneci_tls_cert_source: mycert.pem
 droneci_tls_key_source: mykey.pem
 
 droneci_nginx_vhost_enabled: False
-openhab_nginx_tls_enabled: True
+droneci_nginx_tls_enabled: True
 droneci_nginx_server: myinventoryname
 droneci_nginx_vhost_dir: /etc/nginx/sites-available
 droneci_nginx_vhost_symlink: /etc/nginx/sites-enabled
diff --git a/templates/services/droneci-compose.yml.j2 b/templates/services/droneci-compose.yml.j2
index cc36af2..b9cf60f 100644
--- a/templates/services/droneci-compose.yml.j2
+++ b/templates/services/droneci-compose.yml.j2
@@ -24,7 +24,7 @@ services:
       {% endif %}
       {% if droneci_postgres_persistence_enabled %}
       - DRONE_DATABASE_DRIVER=postgres
-      - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_postgres_user.name }}:{{ droneci_postgres_user.password }}@{{ droneci_postgres_server }}/{{ droneci_postgres_db.name }}{% if not droneci_postgres_tls_enabled %}?sslmode=disable{% endif %}
+      - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_postgres_user.name }}:{{ droneci_postgres_user.password }}@{{ droneci_postgres_server }}/{{ droneci_postgres_db.name }}{% if not droneci_postgres_tls_enabled %}?sslmode={{ droneci_postgres_ssl_mode }}{% endif %}
       {% endif %}
       {% if droneci_gitea_enabled %}
       - DRONE_GITEA=true