diff --git a/defaults/main.yml b/defaults/main.yml
index 266b6c0095c037f814886b30282fca115ad845e9..4d6b18a1ec0ffc189a3c8eb555d997aba5ed6e92 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for limesurvey
+limesurvey_pgdb_port: 5432
diff --git a/tasks/main.yml b/tasks/main.yml
index d5d0587343cb941cc2e5a6d019384affac6cdd41..0822452c786a3dfcf5eb987395855f2388b9dcdb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,7 +6,7 @@
     db_user:
       name: "{{ limesurvey_pgdb_user }}"
       password: "{{ limesurvey_pgdb_pass }}"
-    db_host: "{{ limesurvey_pgdb_host }}"
+    postgres_on_cluster: true
 
 - name: Create limesurvey directory
   ansible.builtin.file:
diff --git a/templates/limesurvey.env.j2 b/templates/limesurvey.env.j2
index 55b6cad884202f7ca2864fe12b3a4a9a05488114..059a653739e58dfa628ef8a4f43d2c29e0d3a5bf 100644
--- a/templates/limesurvey.env.j2
+++ b/templates/limesurvey.env.j2
@@ -1,6 +1,6 @@
 DB_TYPE=pgsql
-DB_HOST={{ hostvars[limesurvey_pgdb_host]['ansible_default_ipv4']['address'] }}
-DB_PORT=5432
+DB_HOST={{ hostvars[limesurvey_pgdb_host]['ansible_default_ipv4']['address'] | default(limesurvey_pgdb_host) }}
+DB_PORT={{ limesurvey_pgdb_port }}
 DB_NAME={{ limesurvey_pgdb_user }}
 DB_USERNAME={{ limesurvey_pgdb_user }}
 DB_PASSWORD={{ limesurvey_pgdb_pass }}